Merge lp:~mwhudson/bzr-svn/incremental-imports into lp:bzr-svn/1.0

[Michael Hudson-Doyle]

Add incremental pull support.

[Michael Hudson-Doyle (mwhudson)]

Hi Jelmer,

This branch adds incremental pull support to bzr-svn, very much following the pattern of the changes I made to bzr-git. The tests don't seem to be very much like the tests around them, but maybe that's OK.

The new tests pass, I haven't managed to get a clean test run of the whole suite yet, but I don't think the failures are my fault...

Cheers,
mwh

[Michael Hudson-Doyle (mwhudson)]

Michael Hudson wrote:
> The new tests pass, I haven't managed to get a clean test run of the whole suite yet, but I don't think the failures are my fault...

I have now, and they pass (my subvertpy wasn't up to date).

Cheers,
mwh

=== modified file 'branch.py'
--- branch.py	2010-02-27 19:20:20 +0000
+++ branch.py	2010-03-03 06:04:29 +0000
@@ -660,7 +660,12 @@
        history browsing operations
     """
 
-    def update_revisions(self, stop_revision=None, overwrite=False, graph=None):
+    def update_revisions(self, stop_revision=None, overwrite=False,
+                         graph=None):
+        self._update_revisions(stop_revision, overwrite, graph)
+
+    def _update_revisions(self, stop_revision=None, overwrite=False,
+                         graph=None, limit=None):
         """See InterBranch.update_revisions()."""
         self.source.lock_read()
         try:
@@ -680,17 +685,23 @@
             # graph, which will be cached in memory.
             interrepo = InterFromSvnRepository(self.source.repository,
                                                self.target.repository)
-            interrepo.fetch(stop_revision, project=self.source.project,
-                            mapping=self.source.mapping)
-            # Check to see if one is an ancestor of the other
+            new_head = interrepo._fetch(
+                stop_revision, project=self.source.project,
+                mapping=self.source.mapping, limit=limit)
+            if new_head is not None:
+                stop_revision = new_head[0].get_revision_id(new_head[1])
             if not overwrite:
                 if graph is None:
                     graph = self.target.repository.get_graph()
-                if self.target._check_if_descendant_or_diverged(
-                        stop_revision, last_rev, graph, self.source):
-                    # stop_revision is a descendant of last_rev, but we
-                    # aren't overwriting, so we're done.
-                    return
+                self.target.lock_read()
+                try:
+                    if self.target._check_if_descendant_or_diverged(
+                            stop_revision, last_rev, graph, self.source):
+                        # stop_revision is a descendant of last_rev, but we
+                        # aren't overwriting, so we're done.
+                        return
+                finally:
+                    self.target.unlock()
             self.target.generate_revision_history(stop_revision)
         finally:
             self.source.unlock()
@@ -708,7 +719,7 @@
 
     def pull(self, overwrite=False, stop_revision=None,
              _hook_master=None, run_hooks=True, possible_transports=None,
-             _override_hook_target=None, local=False):
+             _override_hook_target=None, local=False, limit=None):
         """See InterBranch.pull()."""
         if local:
             raise LocalRequiresBoundBranch()
@@ -746,7 +757,7 @@
             else:
                 result.new_revmeta = None
                 tags_until_revnum = self.source.repository.get_latest_revnum()
-            self.update_revisions(stop_revision, overwrite)
+            self._update_revisions(stop_revision, overwrite, limit=limit)
             (result.new_revno, result.new_revid) = \
                 self.target.last_revision_info()
             if self.source.supports_tags():

=== modified file 'fetch.py'
--- fetch.py	2010-02-27 19:20:20 +0000
+++ fetch.py	2010-03-03 06:04:29 +0000
@@ -1261,6 +1261,13 @@
 
     def fetch(self, revision_id=None, pb=None, find_ghosts=False,
               needed=None, mapping=None, project=None, fetch_spec=None):
+        self._fetch(
+            revision_id, pb, find_ghosts, needed, mapping, project,
+            fetch_spec)
+
+    def _fetch(self, revision_id=None, pb=None, find_ghosts=False,
+              needed=None, mapping=None, project=None, fetch_spec=None,
+              limit=None):
         """Fetch revisions. """
         if revision_id == NULL_REVISION:
             return
@@ -1300,7 +1307,7 @@
 
             if len(needed) == 0:
                 # Nothing to fetch
-                return
+                return None
 
             if pb:
                 pb.update("fetch phase", 1, 2)
@@ -1310,10 +1317,13 @@
                 nested_pb = pb
             else:
                 nested_pb = None
+            if limit is not None:
+                needed = needed[:limit]
             try:
                 pack_hint = self._fetch_revisions(needed, pb)
                 if pack_hint is not None and self.target._format.pack_compresses:
                     self.target.pack(hint=pack_hint)
+                return needed[-1]
             finally:
                 if nested_pb is not None:
                     nested_pb.finished()
@@ -1334,7 +1344,6 @@
         :param pb: Optional progress bar
         """
         self._prev_inv = None
-        currange = None
         activeranges = defaultdict(list)
         pb = ui.ui_factory.nested_progress_bar()
         try:

=== modified file 'tests/test_branch.py'
--- tests/test_branch.py	2009-11-18 18:00:27 +0000
+++ tests/test_branch.py	2010-03-03 06:04:29 +0000
@@ -22,6 +22,7 @@
 from bzrlib import urlutils
 from bzrlib.branch import (
     Branch,
+    InterBranch,
     )
 from bzrlib.bzrdir import (
     BzrDir,
@@ -305,6 +306,59 @@
         self.assertEquals(result.source_branch, otherbranch)
         self.assertEquals(result.target_branch, branch)
 
+    def make_tworev_branch(self):
+        repos_url = self.make_repository("a")
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file('foo')
+        dc.close()
+
+        b = Branch.open(repos_url)
+        mapping = b.repository.get_mapping()
+        uuid = b.repository.uuid
+        revid1 = mapping.revision_id_foreign_to_bzr((uuid, '', 0))
+        revid2 = mapping.revision_id_foreign_to_bzr((uuid, '', 1))
+        return b, (revid1, revid2)
+
+    def make_branch(self, relpath):
+        # The inherited make_branch is broken, thanks to the make_repository
+        # from subvertpy.
+        bzrdir = self.make_bzrdir(relpath)
+        bzrdir._find_or_create_repository(True)
+        return bzrdir.create_branch()
+
+    def test_interbranch_pull(self):
+        svn_branch, (revid1, revid2) = self.make_tworev_branch()
+        new_branch = self.make_branch("b")
+        inter_branch = InterBranch.get(svn_branch, new_branch)
+        inter_branch.pull()
+        self.assertEquals(revid2, new_branch.last_revision())
+
+    def test_interbranch_pull_noop(self):
+        svn_branch, (revid1, revid2) = self.make_tworev_branch()
+        new_branch = self.make_branch("b")
+        inter_branch = InterBranch.get(svn_branch, new_branch)
+        inter_branch.pull()
+        # This is basically "assertNotRaises"
+        inter_branch.pull()
+        self.assertEquals(revid2, new_branch.last_revision())
+
+    def test_interbranch_pull_stop_revision(self):
+        svn_branch, (revid1, revid2) = self.make_tworev_branch()
+        new_branch = self.make_branch("b")
+        inter_branch = InterBranch.get(svn_branch, new_branch)
+        inter_branch.pull(stop_revision=revid1)
+        self.assertEquals(revid1, new_branch.last_revision())
+
+    def test_interbranch_limited_pull(self):
+        svn_branch, (revid1, revid2) = self.make_tworev_branch()
+        new_branch = self.make_branch("b")
+        inter_branch = InterBranch.get(svn_branch, new_branch)
+        inter_branch.pull(limit=1)
+        self.assertEquals(revid1, new_branch.last_revision())
+        inter_branch.pull(limit=1)
+        self.assertEquals(revid2, new_branch.last_revision())
+
     def test_get_branch_path_subdir(self):
         repos_url = self.make_repository("a")