Rev 3110: Restore checking to see if common_walker nodes in http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/graph_update

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/graph_update

------------------------------------------------------------
revno: 3110
revision-id:john at arbash-meinel.com-20071220182347-1mdusirdx7c5yn04
parent: john at arbash-meinel.com-20071220182020-einbxflfmn2bi8jy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: graph_update
timestamp: Thu 2007-12-20 12:23:47 -0600
message:
  Restore checking to see if common_walker nodes
  are seen by the other walkers.
modified:
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2007-12-20 18:20:20 +0000
+++ b/bzrlib/graph.py	2007-12-20 18:23:47 +0000
@@ -376,7 +376,8 @@
             parent_map = self.get_parent_map(next_to_search)
             ancestors = set()
             # advance searches
-            common_walker.step(parent_map)
+            new_common = set()
+            new_common.update(common_walker.step(parent_map))
             for candidate in active_searchers.keys():
                 try:
                     searcher = active_searchers[candidate]
@@ -391,7 +392,6 @@
                 else:
                     del active_searchers[candidate]
             # process found nodes
-            new_common = set()
             for ancestor in ancestors:
                 if ancestor in candidate_heads:
                     candidate_heads.remove(ancestor)