Rev 3381: Fix stupid ordering in find_seen_ancestors in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences
John Arbash Meinel
john at arbash-meinel.com
Tue Apr 22 21:16:58 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences
------------------------------------------------------------
revno: 3381
revision-id: john at arbash-meinel.com-20080422201019-lqfw2p8dic55an0e
parent: john at arbash-meinel.com-20080422200449-mknvyea4ndx8uxw0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_differences
timestamp: Tue 2008-04-22 15:10:19 -0500
message:
Fix stupid ordering in find_seen_ancestors
Don't call stop_searching_any on all ancestors, call it on all of them
after you have sorted it out.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py 2008-04-22 18:59:52 +0000
+++ b/bzrlib/graph.py 2008-04-22 20:10:19 +0000
@@ -853,13 +853,13 @@
searcher = _BreadthFirstSearcher(revisions, self._parents_provider)
seen_ancestors = set()
for ancestors in searcher:
+ stop_nodes = set()
for ancestor in ancestors:
- stop_nodes = set()
if ancestor not in self.seen:
stop_nodes.add(ancestor)
else:
seen_ancestors.add(ancestor)
- searcher.stop_searching_any(stop_nodes)
+ searcher.stop_searching_any(stop_nodes)
return seen_ancestors
def stop_searching_any(self, revisions):
More information about the bazaar-commits
mailing list