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

[Parth Malwankar]

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

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

[Andrew Bennetts (spiv)]

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

[Andrew Bennetts (spiv)]

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

[Parth Malwankar (parthm)]

> 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

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-04-28 10:33:44 +0000
+++ bzrlib/builtins.py	2010-04-29 12:16:21 +0000
@@ -3073,7 +3073,7 @@
                          "the master branch until a normal commit "
                          "is performed."
                     ),
-             Option('show-diff',
+             Option('show-diff', short_name='p',
                     help='When no message is supplied, show the diff along'
                     ' with the status summary in the message editor.'),
              ]