Rev 2529: Better option names for missing (elliot) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2529
revision-id: pqm at pqm.ubuntu.com-20070615062113-gl52qb0poutr1rm2
parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
parent: mbp at sourcefrog.net-20070615052724-yeec92utnzbd2z1w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-15 07:21:13 +0100
message:
  Better option names for missing (elliot)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2528.1.1
    merged: mbp at sourcefrog.net-20070615052724-yeec92utnzbd2z1w
    parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2007-06-15 15:27:24 +1000
    message:
      Better option names for missing (elliot)
=== modified file 'NEWS'
--- a/NEWS	2007-06-14 04:36:50 +0000
+++ b/NEWS	2007-06-15 05:27:24 +0000
@@ -13,6 +13,9 @@
       abbreviated format info.  ``info -v`` displays all the information
       formerly displayed by ``info``.  (Aaron Bentley)
 
+    * ``bzr missing`` now has better option names ``--this`` and ``--other``.
+      (Elliot Murphy)
+
 bzr 0.17rc1  2007-06-12
 
   NOTES WHEN UPGRADING:

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-06-14 04:36:50 +0000
+++ b/bzrlib/builtins.py	2007-06-15 05:27:24 +0000
@@ -2967,7 +2967,7 @@
 
 class cmd_missing(Command):
     """Show unmerged/unpulled revisions between two branches.
-
+    
     OTHER_BRANCH may be local or remote.
     """
 
@@ -2976,8 +2976,10 @@
     takes_options = [Option('reverse', 'Reverse the order of revisions'),
                      Option('mine-only', 
                             'Display changes in the local branch only'),
+                     Option('this' , 'same as --mine-only'),
                      Option('theirs-only', 
-                            'Display changes in the remote branch only'), 
+                            'Display changes in the remote branch only'),
+                     Option('other', 'same as --theirs-only'),
                      'log-format',
                      'show-ids',
                      'verbose'
@@ -2987,9 +2989,15 @@
     @display_command
     def run(self, other_branch=None, reverse=False, mine_only=False,
             theirs_only=False, log_format=None, long=False, short=False, line=False, 
-            show_ids=False, verbose=False):
+            show_ids=False, verbose=False, this=False, other=False):
         from bzrlib.missing import find_unmerged, iter_log_revisions
         from bzrlib.log import log_formatter
+
+        if this:
+          mine_only = this
+        if other:
+          theirs_only = other
+
         local_branch = Branch.open_containing(u".")[0]
         parent = local_branch.get_parent()
         if other_branch is None: