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

[Michael Hudson-Doyle]

Move to a newer bzr-svn and start doing incremental bzr-svn imports

Hi,

This branch moves us to using a newer bzr-svn and does incremental bzr-svn imports.

Cheers,
mwh

[Tim Penhey (thumper)]

Well that looks easy. I bet the bzr-svn branch was bigger.

review: Approve

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-02-23 22:37:03 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-03-12 02:35:28 +0000
@@ -896,8 +896,33 @@
         self.assertRaises(NotBranchError, worker.run)
 
 
+class PartialTest:
+    """A test case for incremental imports.
+
+    When all foreign branch plugins support incremental imports, this can go
+    into PullingImportWorkerTests.  For now though, bzr-hg still lacks the
+    needed support.
+    """
+
+    def test_partial(self):
+        # Only config.codeimport.revisions_import_limit will be imported in a
+        # given run.  When bzr-svn and bzr-hg support revision import limits,
+        # this test case can be moved up to PullingImportWorkerTests.
+        worker = self.makeImportWorker(self.makeSourceDetails(
+            'trunk', [('README', 'Original contents')]))
+        self.makeForeignCommit(worker.source_details)
+        self.assertTrue(self.foreign_commit_count > 1)
+        self.pushConfig(
+            'codeimport', revisions_import_limit=self.foreign_commit_count-1)
+        self.assertEqual(
+            CodeImportWorkerExitCode.SUCCESS_PARTIAL, worker.run())
+        self.assertEqual(
+            CodeImportWorkerExitCode.SUCCESS, worker.run())
+
+
+
 class TestGitImport(WorkerTest, TestActualImportMixin,
-                    PullingImportWorkerTests):
+                    PullingImportWorkerTests, PartialTest):
 
     rcstype = 'git'
 
@@ -950,20 +975,6 @@
         return self.factory.makeCodeImportSourceDetails(
             rcstype='git', url=repository_path)
 
-    def test_partial(self):
-        # Only config.codeimport.revisions_import_limit will be imported in a
-        # given run.  When bzr-svn and bzr-hg support revision import limits,
-        # this test case can be moved up to PullingImportWorkerTests.
-        worker = self.makeImportWorker(self.makeSourceDetails(
-            'trunk', [('README', 'Original contents')]))
-        self.makeForeignCommit(worker.source_details)
-        self.assertTrue(self.foreign_commit_count > 1)
-        self.pushConfig(
-            'codeimport', revisions_import_limit=self.foreign_commit_count-1)
-        self.assertEqual(
-            CodeImportWorkerExitCode.SUCCESS_PARTIAL, worker.run())
-        self.assertEqual(
-            CodeImportWorkerExitCode.SUCCESS, worker.run())
 
 
 class TestMercurialImport(WorkerTest, TestActualImportMixin,
@@ -1018,7 +1029,8 @@
 
 
 class TestBzrSvnImport(WorkerTest, SubversionImportHelpers,
-                       TestActualImportMixin, PullingImportWorkerTests):
+                       TestActualImportMixin, PullingImportWorkerTests,
+                       PartialTest):
 
     rcstype = 'bzr-svn'
 

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-02-23 21:26:40 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2010-03-12 02:35:28 +0000
@@ -524,8 +524,8 @@
     def getExtraPullArgs(self):
         """Return extra arguments to `InterBranch.pull`.
 
-        This method only really exists because only bzr-git supports the
-        'limit' argument to this method.  When bzr-svn and bzr-hg plugin do
+        This method only really exists because only bzr-git and bzr-svn
+        support the 'limit' argument to this method.  When bzr-hg plugin does
         too, this method can go away.
         """
         return {}
@@ -652,6 +652,10 @@
 class BzrSvnImportWorker(PullingImportWorker):
     """An import worker for importing Subversion via bzr-svn."""
 
+    def getExtraPullArgs(self):
+        """See `PullingImportWorker.getExtraPullArgs`."""
+        return {'limit': config.codeimport.revisions_import_limit}
+
     @property
     def format_classes(self):
         """See `PullingImportWorker.opening_format`."""

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-03-04 20:19:39 +0000
+++ utilities/sourcedeps.conf	2010-03-12 02:35:28 +0000
@@ -2,7 +2,7 @@
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=251
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47
-bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2707
+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2708
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=430
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=417
 launchpad-loggerhead lp:~launchpad-pqm/launchpad-loggerhead/devel;revno=54