Rev 5194: (Parth Malwankar) Define -p (for patch) as the short form of in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5194 [merge]
revision-id: pqm at pqm.ubuntu.com-20100430041030-l3r7uul12me6bx9f
parent: pqm at pqm.ubuntu.com-20100429073011-5f4kzm2wpojq9we1
parent: andrew.bennetts at canonical.com-20100430025120-kwbktyjtuxnt8bom
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-04-30 05:10:30 +0100
message:
  (Parth Malwankar) Define -p (for patch) as the short form of
  	--show-diff in 'bzr commit' (#571461)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS	2010-04-29 05:52:35 +0000
+++ b/NEWS	2010-04-30 02:51:20 +0000
@@ -16,6 +16,10 @@
 New Features
 ************
 
+* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
+  ``--show-diff``.
+  (Parth Malwankar, #571467)
+  
 * ``bzr ignore`` now supports a ``--default-rules`` option that displays
   the default ignore rules used by bzr. The flag ``--old-default-rules``
   is no longer supported by ``ignore``.

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-04-28 10:33:44 +0000
+++ b/bzrlib/builtins.py	2010-04-29 12:10:19 +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.'),
              ]