Rev 3404: some simple updates in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_unique_ancestors

John Arbash Meinel john at arbash-meinel.com
Fri Apr 25 01:46:35 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_unique_ancestors

------------------------------------------------------------
revno: 3404
revision-id: john at arbash-meinel.com-20080425004033-y7p8ol60qntr1pyn
parent: john at arbash-meinel.com-20080425003535-l6a6okvcdhn8f2sj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_unique_ancestors
timestamp: Thu 2008-04-24 19:40:33 -0500
message:
  some simple updates
modified:
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2008-04-25 00:35:35 +0000
+++ b/bzrlib/graph.py	2008-04-25 00:40:33 +0000
@@ -238,9 +238,11 @@
         # 6) Search is done when all common searchers have completed.
 
         unique_searcher = self._make_breadth_first_searcher([unique_revision])
+        # we know that unique_revision isn't in common_revisions
+        unique_searcher.next()
         common_searcher = self._make_breadth_first_searcher(common_revisions)
 
-        while True:
+        while unique_searcher._next_query:
             next_unique_nodes = set(unique_searcher.step())
             next_common_nodes = set(common_searcher.step())
 
@@ -257,10 +259,6 @@
                 unique_searcher.stop_searching_any(ancestors)
                 common_searcher.start_searching(ancestors)
 
-            # Are there any more nodes to search?
-            if not unique_searcher._next_query:
-                break
-
         unique_nodes = unique_searcher.seen.difference(common_searcher.seen)
         if not unique_nodes:
             return unique_nodes

=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py	2008-04-25 00:35:35 +0000
+++ b/bzrlib/tests/test_graph.py	2008-04-25 00:40:33 +0000
@@ -1098,10 +1098,10 @@
         self.assertFindUniqueAncestors(graph, ['f'], 'f', ['a', 'd'])
 
         graph = self.make_breaking_graph(complex_shortcut,
-                                         ['a', 'b', 'c'])
+                                         ['a', 'b'])
         self.assertFindUniqueAncestors(graph, ['h'], 'h', ['i'])
         self.assertFindUniqueAncestors(graph, ['e', 'g', 'i'], 'i', ['h'])
-
+        self.assertFindUniqueAncestors(graph, ['h'], 'h', ['g'])
         self.assertFindUniqueAncestors(graph, ['h'], 'h', ['j'])
 
     def test_in_ancestry(self):



More information about the bazaar-commits mailing list