Rev 90: Fix selftest failures. 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-20081218130511-061kxb9f2im27bt4
parent: jml at canonical.com-20081201042117-bjhw3e1aktq00z4y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: loom
timestamp: Thu 2008-12-18 14:05:11 +0100
message:
  Fix selftest failures.
  
  * commands.py:
  (cmd_up_thread): 'up' alias is already used by 'bzr update'.
  
  * branch.py:
  (LoomSupport.get_stacked_on_url, LoomSupport.set_stacked_on_url,
  	
-------------- next part --------------
=== modified file 'branch.py'
--- a/branch.py	2008-10-17 19:24:04 +0000
+++ b/branch.py	2008-12-18 13:05:11 +0000
@@ -602,6 +602,12 @@
                     self.record_thread(self.nick, lastrev)
         super(LoomSupport, self).unlock()
 
+    def get_stacked_on_url(self):
+        raise bzrlib.errors.UnstackableBranchFormat(self._format, self.base)
+
+    def set_stacked_on_url(self, url):
+        raise bzrlib.errors.UnstackableBranchFormat(self._format, self.base)
+
 
 class _Puller(object):
 
@@ -833,6 +839,9 @@
         state_stream.seek(0)
         branch._transport.put_file('last-loom', state_stream)
 
+    def supports_stacking(self):
+        """True if this format records a stacked-on branch."""
+        return False
 
 
 class BzrBranchLoomFormat1(LoomFormatMixin, bzrlib.branch.BzrBranchFormat5):
@@ -857,7 +866,7 @@
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
         return "Loom branch format 1"
-        
+
     def __str__(self):
         return "Bazaar-NG Loom format 1"
 
@@ -884,7 +893,7 @@
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
         return "Loom branch format 6"
-        
+
     def __str__(self):
         return "bzr loom format 6 (based on bzr branch format 6)\n"
 

=== modified file 'commands.py'
--- a/commands.py	2008-11-19 07:18:17 +0000
+++ b/commands.py	2008-12-18 13:05:11 +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):