Rev 4981: Fixed as per Ian's review. in file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

------------------------------------------------------------
revno: 4981
revision-id: v.ladeuil+lp at free.fr-20100203081704-ys4dkii54g9joqv9
parent: v.ladeuil+lp at free.fr-20100201163644-9rc3jredh74mk83q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: respect-direction
timestamp: Wed 2010-02-03 09:17:04 +0100
message:
  Fixed as per Ian's review.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2010-02-01 16:26:37 +0000
+++ b/bzrlib/log.py	2010-02-03 08:17:04 +0000
@@ -537,7 +537,7 @@
                             delayed_graph_generation):
     # On large trees, generating the merge graph can take 30-60 seconds
     # so we delay doing it until a merge is detected, incrementally
-    # returning initial (non-merge) revisions while we can. 
+    # returning initial (non-merge) revisions while we can.
 
     # The above is only true for old formats (<= 0.92), for newer formats, a
     # couple of seconds only should be needed to load the whole graph and the

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2010-02-01 16:26:37 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2010-02-03 08:17:04 +0000
@@ -159,10 +159,10 @@
         self.assertLogRevnos(['-c1'], ['1'])
 
 
-class TestBug474807(TestLogWithLogCatcher):
+class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
 
     def setUp(self):
-        super(TestBug474807, self).setUp()
+        super(TestLogMergedLinearAncestry, self).setUp()
         # FIXME: Using a MemoryTree would be even better here (but until we
         # stop calling run_bzr, there is no point) --vila 100118.
         builder = branchbuilder.BranchBuilder(self.get_transport())
@@ -203,9 +203,9 @@
                              ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
 
 
-class TestBug476293(TestLogWithLogCatcher):
+class Test_GenerateAllRevisions(TestLogWithLogCatcher):
 
-    def make_tagged_branch(self, path='.', format=None):
+    def make_branch_with_many_merges(self, path='.', format=None):
         builder = branchbuilder.BranchBuilder(self.get_transport())
         builder.start_series()
         # The graph below may look a bit complicated (and it may be but I've
@@ -223,11 +223,10 @@
         builder.build_snapshot('4', ['3', '2.1.3'], [])
         builder.build_snapshot('5', ['4', '2.1.2'], [])
         builder.finish_series()
-        tags = builder.get_branch().tags
         return builder
 
     def test_not_an_ancestor(self):
-        builder = self.make_tagged_branch()
+        builder = self.make_branch_with_many_merges()
         b = builder.get_branch()
         b.lock_read()
         self.addCleanup(b.unlock)
@@ -237,7 +236,7 @@
                           delayed_graph_generation=True)
 
     def test_wrong_order(self):
-        builder = self.make_tagged_branch()
+        builder = self.make_branch_with_many_merges()
         b = builder.get_branch()
         b.lock_read()
         self.addCleanup(b.unlock)