Rev 3407: Can we avoid the extra _do_query in start_searching? in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_unique_ancestors

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3407
revision-id: john at arbash-meinel.com-20080425021017-49mxjzvgk0enbhey
parent: john at arbash-meinel.com-20080425020453-4txgyv9utbd73y21
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_unique_ancestors
timestamp: Thu 2008-04-24 21:10:17 -0500
message:
  Can we avoid the extra _do_query in start_searching?
modified:
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2008-04-25 02:04:53 +0000
+++ b/bzrlib/graph.py	2008-04-25 02:10:17 +0000
@@ -1081,12 +1081,13 @@
         revisions = frozenset(revisions)
         self._started_keys.update(revisions)
         new_revisions = revisions.difference(self.seen)
-        revs, ghosts, query, parents = self._do_query(revisions)
-        self._stopped_keys.update(ghosts)
         if self._returning == 'next':
             self._next_query.update(new_revisions)
+            self.seen.update(new_revisions)
         else:
             # perform a query on revisions
+            revs, ghosts, query, parents = self._do_query(revisions)
+            self._stopped_keys.update(ghosts)
             self._current_present.update(revs)
             self._current_ghosts.update(ghosts)
             self._next_query.update(query)