Rev 3392: minor update in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3392
revision-id: john at arbash-meinel.com-20080423215543-f4wrfck5ag25pjjq
parent: john at arbash-meinel.com-20080423214212-i63wv3x7s27ekjim
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_differences
timestamp: Wed 2008-04-23 16:55:43 -0500
message:
  minor update
modified:
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2008-04-23 21:42:12 +0000
+++ b/bzrlib/graph.py	2008-04-23 21:55:43 +0000
@@ -514,9 +514,7 @@
         common_searchers = searchers
         left_searcher = searchers[0]
         right_searcher = searchers[1]
-        left_unique = left_searcher.seen.difference(right_searcher.seen)
-        right_unique = right_searcher.seen.difference(left_searcher.seen)
-        unique = left_unique.union(right_unique)
+        unique = left_searcher.seen.symmetric_difference(right_searcher.seen)
         total_unique = len(unique)
         unique = self._remove_simple_descendants(unique,
                     self.get_parent_map(unique))
@@ -526,14 +524,17 @@
 
         unique_searchers = []
         for revision_id in unique:
-            if revision_id in left_unique:
+            if revision_id in left_searcher.seen:
                 parent_searcher = left_searcher
             else:
                 parent_searcher = right_searcher
             revs_to_search = parent_searcher.find_seen_ancestors([revision_id])
             if not revs_to_search: # XXX: This shouldn't be possible
                 revs_to_search = [revision_id]
-            unique_searchers.append(self._make_breadth_first_searcher(revs_to_search))
+            searcher = self._make_breadth_first_searcher(revs_to_search)
+            # We don't care about the starting nodes.
+            searcher.step()
+            unique_searchers.append(searcher)
 
         # Aggregate all of the searchers into a single common searcher, would
         # it be okay to do this?