Rev 2007: Fix bug in range fetching. in file:///data/jelmer/bzr-svn/0.5/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2007
revision-id: jelmer at samba.org-20081117200641-4zeqwdo3r7sb8fzi
parent: jelmer at samba.org-20081117175853-g88b5y8bfp000x8z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-11-17 21:06:41 +0100
message:
  Fix bug in range fetching.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'fetch.py'
--- a/fetch.py	2008-11-17 16:58:41 +0000
+++ b/fetch.py	2008-11-17 20:06:41 +0000
@@ -71,8 +71,6 @@
         assert self.revmeta.revnum == revnum
 
     def open_root(self, base_revnum=None):
-        if base_revnum is None:
-            base_revnum = self.revmeta.revnum
         return self._open_root(base_revnum)
 
     def close(self):
@@ -99,7 +97,6 @@
     def open_directory(self, path, base_revnum):
         assert isinstance(path, str)
         path = path.decode("utf-8")
-        assert base_revnum >= 0
         return self._open_directory(path, base_revnum)
 
     def change_prop(self, name, value):
@@ -814,8 +811,9 @@
         try:
             for i, (revmeta, mapping) in enumerate(revs):
                 pb.update("determining revision ranges", i, len(revs))
-                if revmeta.metabranch is not None and curmetabranch == revmeta.metabranch:
-                    (branch_path, low_water_mark, from_revnum, to_revum, revmetas) = currange
+                if (revmeta.metabranch is not None and
+                    curmetabranch == revmeta.metabranch):
+                    (branch_path, low_water_mark, from_revnum, to_revnum, revmetas) = currange
                     revmetas[revmeta.revnum] = (revmeta, mapping)
                     currange = (revmeta.branch_path, low_water_mark, from_revnum, revmeta.revnum, revmetas)
                 else:
@@ -849,7 +847,7 @@
                 def revfinish(revision, revprops, editor):
                     self._prev_inv = editor.inventory
 
-                conn = self.source.transport.get_connection(revmeta.branch_path)
+                conn = self.source.transport.get_connection(branch_path)
                 try:
                     conn.replay_range(start_revision, end_revision, low_water_mark, (revstart, revfinish), True)
                 finally:

=== modified file 'transport.py'
--- a/transport.py	2008-11-17 02:01:55 +0000
+++ b/transport.py	2008-11-17 20:06:41 +0000
@@ -571,11 +571,11 @@
 
     def replay_range(self, start_revision, end_revision, low_water_mark, cbs, 
                      send_deltas=True):
-        mutter("svn replay-range %d -> %d" % (start_revision, end_revision))
+        mutter("svn replay-range %d -> %d (low water mark: %d)" % (start_revision, end_revision, low_water_mark))
         return self.actual.replay_range(start_revision, end_revision, low_water_mark, cbs, 
                    send_deltas)
 
     def replay(self, revision, low_water_mark, editor, send_deltas=True):
-        mutter("svn replay %d" % (revision,))
+        mutter("svn replay %d (low water mark: %d)" % (revision, low_water_mark))
         return self.actual.replay(revision, low_water_mark, editor, send_deltas)