Rev 90: Fix selftest failure. in file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/loom/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/loom/

------------------------------------------------------------
revno: 90
revision-id: v.ladeuil+lp at free.fr-20081219130457-yd1rwwt1yaknmkt5
parent: jml at canonical.com-20081201042117-bjhw3e1aktq00z4y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: loom
timestamp: Fri 2008-12-19 14:04:57 +0100
message:
  Fix selftest failure.
  
  * commands.py:
  (cmd_up_thread): 'up' alias is already used by 'bzr update'.
-------------- next part --------------
=== modified file 'commands.py'
--- a/commands.py	2008-11-19 07:18:17 +0000
+++ b/commands.py	2008-12-19 13:04:57 +0000
@@ -120,7 +120,7 @@
         finally:
             loom.unlock()
 
-            
+
 class cmd_show_loom(bzrlib.commands.Command):
     """Show the threads in this loom.
 
@@ -223,7 +223,7 @@
         """Parse command line and run.
         
         If the command requests it, run the decorated version.
-        """ 
+        """
         try:
             super(cmd_switch, self).run_argv_aliases(list(argv), alias_argv)
         except (errors.MustUseDecorated, errors.BzrOptionError):
@@ -254,7 +254,7 @@
     """
 
     takes_args = ['thread?']
-    takes_options = [Option('all', 
+    takes_options = [Option('all',
                         help='Revert all threads.'),
                      ]
 
@@ -317,7 +317,6 @@
     takes_options = ['merge-type', Option('auto',
         help='Automatically commit and merge repeatedly.')]
 
-    aliases = ['up']
     _see_also = ['down-thread', 'switch']
 
     def run(self, merge_type=None, auto=False):