Merge lp:~jelmer/launchpad/import-colocated-branches into lp:launchpad

[Jelmer Vernooij]

Import newer versions of bzr, bzr-git and dulwich which have support for addressing colocated branches.

Import newer versions of bzr, bzr-git and dulwich which have support for addressing colocated branches.

This makes it possible to import non-HEAD branches from Git repositories (bug 380871).

There already is a branch pending which updates Bazaar in launchpad to version 2.4.0. Rather than cherrypicking the patches that add support for colocated branches from bzr.dev, I have chosen to simply go to a recent snapshot of bzr.dev. The reason for this is that there have only been a few revisions since 2.4.0 in bzr.dev, and backporting a relatively large change like colocated branch support also has its risks.

This does not yet add any extra UI to make it easier for a user to import non-master branch paths - users have to know about the syntax in the Bazaar URL format.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py	2011-08-16 11:33:00 +0000
+++ lib/lp/codehosting/bzrutils.py	2011-09-13 09:42:55 +0000
@@ -101,11 +101,11 @@
     # BzrDir.find_branch_format()), then the branch is not stackable. Bazaar
     # post-1.6 has added 'get_branch_format' to the pre-split-out formats,
     # which we could use instead.
-    find_branch_format = getattr(a_bzrdir, 'find_branch_format', None)
-    if find_branch_format is None:
+    try:
+        format = a_bzrdir.find_branch_format(None)
+    except NotImplementedError:
         raise UnstackableBranchFormat(
             a_bzrdir._format, a_bzrdir.root_transport.base)
-    format = find_branch_format()
     if not format.supports_stacking():
         raise UnstackableBranchFormat(format, a_bzrdir.root_transport.base)
     branch_transport = a_bzrdir.get_branch_transport(None)
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2011-08-28 08:36:14 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2011-09-13 09:42:55 +0000
@@ -12,7 +12,10 @@
 import tempfile
 import time
 
-from bzrlib import trace
+from bzrlib import (
+    trace,
+    urlutils,
+    )
 from bzrlib.branch import (
     Branch,
     BranchReferenceFormat,
@@ -25,7 +28,10 @@
     )
 from bzrlib.errors import NoSuchFile
 from bzrlib.tests import TestCaseWithTransport
-from bzrlib.transport import get_transport
+from bzrlib.transport import (
+    get_transport,
+    get_transport_from_url,
+    )
 from bzrlib.urlutils import (
     join as urljoin,
     local_path_from_url,
@@ -1112,11 +1118,13 @@
             self.bazaar_store, logging.getLogger(),
             opener_policy=opener_policy)
 
-    def makeForeignCommit(self, source_details):
+    def makeForeignCommit(self, source_details, message=None, ref="HEAD"):
         """Change the foreign tree, generating exactly one commit."""
         repo = GitRepo(local_path_from_url(source_details.url))
-        repo.do_commit(message=self.factory.getUniqueString(),
-            committer="Joe Random Hacker <[e-mail]>")
+        if message is None:
+            message = self.factory.getUniqueString()
+        repo.do_commit(message=message,
+            committer="Joe Random Hacker <[e-mail]>", ref=ref)
         self.foreign_commit_count += 1
 
     def makeSourceDetails(self, branch_name, files):
@@ -1133,6 +1141,29 @@
         return self.factory.makeCodeImportSourceDetails(
             rcstype='git', url=git_server.get_url())
 
+    def test_non_master(self):
+        # non-master branches can be specified in the import URL.
+        source_details = self.makeSourceDetails(
+            'trunk', [('README', 'Original contents')])
+        self.makeForeignCommit(source_details, ref="refs/heads/other",
+            message="Message for other")
+        self.makeForeignCommit(source_details, ref="refs/heads/master",
+            message="Message for master")
+        source_details.url = urlutils.join_segment_parameters(
+                source_details.url, { "branch": "other" })
+        source_transport = get_transport_from_url(source_details.url)
+        self.assertEquals(
+            { "branch": "other" },
+            source_transport.get_segment_parameters())
+        worker = self.makeImportWorker(source_details,
+            opener_policy=AcceptAnythingPolicy())
+        self.assertTrue(self.foreign_commit_count > 1)
+        self.assertEqual(
+            CodeImportWorkerExitCode.SUCCESS, worker.run())
+        branch = worker.getBazaarBranch()
+        lastrev = branch.repository.get_revision(branch.last_revision())
+        self.assertEquals(lastrev.message, "Message for other")
+
 
 class TestMercurialImport(WorkerTest, TestActualImportMixin,
                           PullingImportWorkerTests):
@@ -1163,12 +1194,18 @@
             self.bazaar_store, logging.getLogger(),
             opener_policy=opener_policy)
 
-    def makeForeignCommit(self, source_details):
+    def makeForeignCommit(self, source_details, message=None, branch=None):
         """Change the foreign tree, generating exactly one commit."""
         from mercurial.ui import ui
         from mercurial.localrepo import localrepository
         repo = localrepository(ui(), local_path_from_url(source_details.url))
-        repo.commit(text="hello world!", user="Jane Random Hacker", force=1)
+        extra = {}
+        if branch is not None:
+            extra = { "branch": branch }
+        if message is None:
+            message = self.factory.getUniqueString()
+        repo.commit(text=message, user="Jane Random Hacker", force=1,
+            extra=extra)
         self.foreign_commit_count += 1
 
     def makeSourceDetails(self, branch_name, files):
@@ -1185,6 +1222,29 @@
         return self.factory.makeCodeImportSourceDetails(
             rcstype='hg', url=hg_server.get_url())
 
+    def test_non_default(self):
+        # non-default branches can be specified in the import URL.
+        source_details = self.makeSourceDetails(
+            'trunk', [('README', 'Original contents')])
+        self.makeForeignCommit(source_details, branch="other",
+            message="Message for other")
+        self.makeForeignCommit(source_details, branch="default",
+            message="Message for default")
+        source_details.url = urlutils.join_segment_parameters(
+                source_details.url, { "branch": "other" })
+        source_transport = get_transport_from_url(source_details.url)
+        self.assertEquals(
+            { "branch": "other" },
+            source_transport.get_segment_parameters())
+        worker = self.makeImportWorker(source_details,
+            opener_policy=AcceptAnythingPolicy())
+        self.assertTrue(self.foreign_commit_count > 1)
+        self.assertEqual(
+            CodeImportWorkerExitCode.SUCCESS, worker.run())
+        branch = worker.getBazaarBranch()
+        lastrev = branch.repository.get_revision(branch.last_revision())
+        self.assertEquals(lastrev.message, "Message for other")
+
 
 class TestBzrSvnImport(WorkerTest, SubversionImportHelpers,
                        TestActualImportMixin, PullingImportWorkerTests):
 
=== modified file 'lib/lp/codehosting/codeimport/uifactory.py'
--- lib/lp/codehosting/codeimport/uifactory.py	2011-08-03 00:35:38 +0000
+++ lib/lp/codehosting/codeimport/uifactory.py	2011-09-13 09:42:55 +0000
@@ -206,7 +206,3 @@
             self._bytes_since_update = 0
             self._last_transport_msg = msg
             self._repaint()
-
-    # bzr 1.17 renamed _show_transport_activity to show_transport_activity.
-    # When we have upgraded to bzr 1.17, this compatibility hack can go away.
-    _show_transport_activity = show_transport_activity
 
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-09-06 19:40:50 +0000
+++ utilities/sourcedeps.cache	2011-09-13 09:42:55 +0000
@@ -4,12 +4,12 @@
         "[e-mail]-20101123183213-777lz46xgagn1deg"
     ], 
     "bzr-git": [
-        259, 
-        "[e-mail]-20110601140035-gl5merbechngjw5s"
+        264, 
+        "[e-mail]-20110913022112-2x3wgyj2mqof74uy"
     ], 
     "bzr-hg": [
-        290, 
-        "[e-mail]-20110808175904-4gj24x3y21kxepcj"
+        291, 
+        "[e-mail]-20110822162405-m5xrb9p3ahzddmcm"
     ], 
     "bzr-loom": [
         50, 
@@ -28,8 +28,8 @@
         "[e-mail]-20100715135013-uoi3q430urx9gwb8"
     ], 
     "dulwich": [
-        426, 
-        "[e-mail]-20110520175715-e90dzs8os0kotbm9"
+        430, 
+        "[e-mail]-20110913014713-3l8j2zva6pgor5uw"
     ], 
     "loggerhead": [
         456, 
 
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-09-03 02:58:43 +0000
+++ utilities/sourcedeps.conf	2011-09-13 09:42:55 +0000
@@ -1,10 +1,10 @@
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
-bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=290
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=264
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=291
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=50
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=426
+dulwich lp:~launchpad-pqm/dulwich/devel;revno=430
 difftacular lp:difftacular;revno=6
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=456
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 
=== modified file 'versions.cfg'
--- versions.cfg	2011-09-12 23:52:19 +0000
+++ versions.cfg	2011-09-13 09:42:55 +0000
@@ -7,7 +7,7 @@
 ampoule = 0.2.0
 amqplib = 0.6.1
 BeautifulSoup = 3.1.0.1
-bzr = 2.4.1dev-r6045
+bzr = 2.5.0dev1-r6082
 Chameleon = 2.4.0
 ClientForm = 0.2.10
 cssutils = 0.9.6