Bazaar

Merge lp://staging/~parthm/bzr/571467-ci-show-diff-short-opt-p into lp://staging/bzr

571467-ci-show-diff-short-opt-p
Merge into bzr.dev

Proposed by Parth Malwankar on 2010-04-29

Status:

Merged

Merged at revision:

not available

Proposed branch:

lp://staging/~parthm/bzr/571467-ci-show-diff-short-opt-p

Merge into:

lp://staging/bzr

Diff against target:

12 lines (+1/-1)

1 file modified

bzrlib/builtins.py (+1/-1)

To merge this branch:

bzr merge lp://staging/~parthm/bzr/571467-ci-show-diff-short-opt-p

Wishlist

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrew Bennetts		2010-04-29	Approve on 2010-04-30
Review via email: mp+24411@code.staging.launchpad.net

Commit message

Define -p (for patch) as the short form of --show-diff in 'bzr commit'

Description of the change

=== Fixed Bug #571467 ===
Adds short option -p as short_name for --show-diff for commit command.

Revision history for this message

Andrew Bennetts (spiv) wrote on 2010-04-30:

I had to read the bug to figure out why "-p" (it's short for "patch"). It'd be nice to explain that somewhere, but I don't know where would be appropriate. Anyway, this seems fine.

review: Approve

Revision history for this message

Andrew Bennetts (spiv) wrote on 2010-04-30:

Hmm, new option names really deserve a NEWS entry. I'll add one and submit this.

Revision history for this message

Parth Malwankar (parthm) wrote on 2010-04-30:

> I had to read the bug to figure out why "-p" (it's short for "patch"). It'd
> be nice to explain that somewhere, but I don't know where would be
> appropriate. Anyway, this seems fine.

bzr log is somewhat clear on this:
-p, --show-diff Show changes made in each revision as a patch.

For bzr ci its:
-p, --show-diff When no message is supplied, show the diff along with
the status summary in the message editor.

John suggested for another proposal[1] that --null can be pulled into
bzrlib.option.
Maybe we should do something similar for --show-diff/-p?
-p, --show-diff Show changes made in the revision as a patch.

The help message won't be as specific but then the options go together.

[1] https://code.launchpad.net/~parthm/bzr/181124-ls-short-opts/+merge/24414