Rev 1561: Reduce number of revisions searched during bisect. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pushmerged/

------------------------------------------------------------
revno: 1561
revision-id: jelmer at samba.org-20080803165708-2jyf59179jrjza2t
parent: jelmer at samba.org-20080803164254-8hx3afbt3p6nhs9l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 18:57:08 +0200
message:
  Reduce number of revisions searched during bisect.
modified:
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
=== modified file 'revids.py'
--- a/revids.py	2008-08-03 16:41:48 +0000
+++ b/revids.py	2008-08-03 16:57:08 +0000
@@ -175,17 +175,18 @@
                 return (branch_path, min_revnum, BzrSvnMappingv3FileProps(get_scheme(scheme)))
         except NoSuchRevision, e:
             last_revnum = self.actual.repos.get_latest_revnum()
-            if (last_revnum <= self.cache.last_revnum_checked(repr(layout))):
+            last_checked = self.cache.last_revnum_checked(repr(layout))
+            if (last_revnum <= last_checked):
                 # All revision ids in this repository for the current 
                 # layout have already been discovered. No need to 
                 # check again.
                 raise e
             found = False
-            for entry_revid, branch, revno, mapping in self.actual.discover_revids(layout, self.cache.last_revnum_checked(repr(layout)), last_revnum):
+            for entry_revid, branch, revno, mapping in self.actual.discover_revids(layout, last_checked, last_revnum):
                 if entry_revid == revid:
                     found = True
                 if entry_revid not in self.revid_seen:
-                    self.cache.insert_revid(entry_revid, branch, 0, revno, str(mapping.scheme))
+                    self.cache.insert_revid(entry_revid, branch, last_checked, revno, str(mapping.scheme))
                     self.revid_seen.add(entry_revid)
                 
             # We've added all the revision ids for this layout in the repository,