Rev 4430: Fix failing test. in file:///home/vila/src/bzr/reviews/revno_revinfo/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/revno_revinfo/

------------------------------------------------------------
revno: 4430
revision-id: v.ladeuil+lp at free.fr-20090630165921-jdg42f5unm33nz8a
parent: fullermd at over-yonder.net-20090622095540-s4hqvvcks5tqod83
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: revno_revinfo
timestamp: Tue 2009-06-30 18:59:21 +0200
message:
  Fix failing test.
  
  * bzrlib/tests/blackbox/test_revision_info.py:
  Minor cleanups.
  
  * bzrlib/tests/blackbox/test_revno.py:
  Some cleanups.
  
  * bzrlib/builtins.py: 
  (cmd_revno.run): Don't open WT if we don't need to.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-06-22 09:54:39 +0000
+++ b/bzrlib/builtins.py	2009-06-30 16:59:21 +0000
@@ -480,31 +480,29 @@
 
     @display_command
     def run(self, tree=False, location=u'.'):
-        try:
-            wt = WorkingTree.open_containing(location)[0]
-            b = wt.branch
-            wt.lock_read()
-        except (errors.NoWorkingTree, errors.NotLocalUrl):
-            wt = None
-            b = Branch.open_containing(location)[0]
-            b.lock_read()
-        try:
-            if tree:
-                if wt is None:
-                    raise errors.NoWorkingTree(location)
+        if tree:
+            try:
+                wt = WorkingTree.open_containing(location)[0]
+                wt.lock_read()
+            except (errors.NoWorkingTree, errors.NotLocalUrl):
+                raise errors.NoWorkingTree(location)
+            try:
                 revid = wt.last_revision()
                 try:
                     revno_t = wt.branch.revision_id_to_dotted_revno(revid)
                 except errors.NoSuchRevision:
                     revno_t = ('???',)
                 revno = ".".join(str(n) for n in revno_t)
-            else:
+            finally:
+                wt.unlock()
+        else:
+            b = Branch.open_containing(location)[0]
+            b.lock_read()
+            try:
                 revno = b.revno()
-        finally:
-            if wt is None:
+            finally:
                 b.unlock()
-            else:
-                wt.unlock()
+
         self.outf.write(str(revno) + '\n')
 
 

=== modified file 'bzrlib/tests/blackbox/test_revision_info.py'
--- a/bzrlib/tests/blackbox/test_revision_info.py	2009-06-22 09:49:32 +0000
+++ b/bzrlib/tests/blackbox/test_revision_info.py	2009-06-30 16:59:21 +0000
@@ -60,8 +60,8 @@
         self.check_output(values['1.1.1'], 'revision-info 1.1.1')
         self.check_output(values['2'], 'revision-info 2')
         self.check_output(values['1']+values['2'], 'revision-info 1 2')
-        self.check_output('    '+values['1']+\
-                                 values['1.1.1']+\
+        self.check_output('    '+values['1']+
+                                 values['1.1.1']+
                           '    '+values['2'],
                           'revision-info 1 1.1.1 2')
         self.check_output(values['2']+values['1'], 'revision-info 2 1')
@@ -72,8 +72,8 @@
         self.check_output(values['1.1.1'], 'revision-info --revision 1.1.1')
         self.check_output(values['2'], 'revision-info -r 2')
         self.check_output(values['1']+values['2'], 'revision-info -r 1..2')
-        self.check_output('    '+values['1']+\
-                                 values['1.1.1']+\
+        self.check_output('    '+values['1']+
+                                 values['1.1.1']+
                           '    '+values['2'],
                           'revision-info -r 1..1.1.1..2')
         self.check_output(values['2']+values['1'], 'revision-info -r 2..1')

=== modified file 'bzrlib/tests/blackbox/test_revno.py'
--- a/bzrlib/tests/blackbox/test_revno.py	2009-06-22 09:33:02 +0000
+++ b/bzrlib/tests/blackbox/test_revno.py	2009-06-30 16:59:21 +0000
@@ -1,5 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
-# -*- coding: utf-8 -*-
+# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,10 +20,9 @@
 
 import os
 
-from bzrlib.branch import Branch
-from bzrlib.tests import TestCaseWithTransport
+from bzrlib import tests
 
-class TestRevno(TestCaseWithTransport):
+class TestRevno(tests.TestCaseWithTransport):
 
     def test_revno(self):