launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/bzr-2.6 into lp:launchpad.

Commit message:
Upgrade to bzr 2.6.0, and newer bzr-git, bzr-svn, dulwich and cscvs.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #878085 in Launchpad itself: "NoSuchRevision error during git import"
  https://bugs.launchpad.net/launchpad/+bug/878085
  Bug #1072461 in Launchpad itself: "Git HTTP imports don't fetch new revisions"
  https://bugs.launchpad.net/launchpad/+bug/1072461

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/bzr-2.6/+merge/180473

Upgrade to bzr 2.6.0, and newer bzr-git, bzr-svn, dulwich and cscvs.
-- 
https://code.launchpad.net/~wgrant/launchpad/bzr-2.6/+merge/180473
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/bzr-2.6 into lp:launchpad.

=== modified file 'lib/lp/code/bzr.py'
--- lib/lp/code/bzr.py	2012-08-30 14:52:37 +0000
+++ lib/lp/code/bzr.py	2013-08-16 05:37:28 +0000
@@ -26,10 +26,10 @@
 
 from bzrlib.branch import (
     BranchReferenceFormat,
-    BzrBranchFormat5,
     BzrBranchFormat6,
     BzrBranchFormat7,
     )
+from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
 from bzrlib.bzrdir import (
     BzrDirMetaFormat1,
     BzrDirMetaFormat1Colo,

=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfs.py'
--- lib/lp/codehosting/vfs/tests/test_branchfs.py	2013-01-07 02:40:55 +0000
+++ lib/lp/codehosting/vfs/tests/test_branchfs.py	2013-08-16 05:37:28 +0000
@@ -954,60 +954,43 @@
             revid,
             self._branch_changed_log[0]['last_revision'])
 
+    def assertStackedOnIsRewritten(self, input, output):
+        db_branch = self.factory.makeAnyBranch(
+            branch_type=BranchType.HOSTED, owner=self.requester)
+        branch = self.make_branch(db_branch.unique_name)
+        del self._branch_changed_log[:]
+        branch.lock_write()
+        branch._set_config_location('stacked_on_location', input)
+        branch.unlock()
+        # Clear the branch config cache to pick up the changes we made
+        # directly to the filesystem.
+        branch._get_config_store().unload()
+        self.assertEqual(output, branch.get_stacked_on_url())
+        self.assertEqual(1, len(self._branch_changed_log))
+        self.assertEqual(output, self._branch_changed_log[0]['stacked_on_url'])
+
     def test_branch_unlock_relativizes_absolute_stacked_on_url(self):
         # When a branch that has been stacked on the absolute URL of another
         # Launchpad branch is unlocked, the branch is mutated to be stacked on
         # the path part of that URL, and this relative path is passed to
         # branchChanged().
-        db_branch = self.factory.makeAnyBranch(
-            branch_type=BranchType.HOSTED, owner=self.requester)
-        branch = self.make_branch(db_branch.unique_name)
-        del self._branch_changed_log[:]
-        branch.lock_write()
-        branch.get_config().set_user_option(
-            'stacked_on_location',
-            'http://bazaar.launchpad.dev/~user/product/branch')
-        branch.unlock()
-        self.assertEqual('/~user/product/branch', branch.get_stacked_on_url())
-        self.assertEqual(1, len(self._branch_changed_log))
-        self.assertEqual(
-            '/~user/product/branch',
-            self._branch_changed_log[0]['stacked_on_url'])
+        self.assertStackedOnIsRewritten(
+            'http://bazaar.launchpad.dev/~user/product/branch',
+            '/~user/product/branch')
 
     def test_branch_unlock_ignores_non_launchpad_stacked_url(self):
         # When a branch that has been stacked on the absolute URL of a branch
         # that is not on Launchpad, it is passed unchanged to branchChanged().
-        db_branch = self.factory.makeAnyBranch(
-            branch_type=BranchType.HOSTED, owner=self.requester)
-        branch = self.make_branch(db_branch.unique_name)
-        del self._branch_changed_log[:]
-        stacked_on_url = 'http://example.com/~user/foo'
-        branch.lock_write()
-        branch.get_config().set_user_option(
-            'stacked_on_location', stacked_on_url)
-        branch.unlock()
-        self.assertEqual(1, len(self._branch_changed_log))
-        self.assertEqual(
-            stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
-        self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
+        self.assertStackedOnIsRewritten(
+            'http://example.com/~user/foo', 'http://example.com/~user/foo')
 
     def test_branch_unlock_ignores_odd_scheme_stacked_url(self):
         # When a branch that has been stacked on the absolute URL of a branch
         # on Launchpad with a scheme we don't understand, it is passed
         # unchanged to branchChanged().
-        db_branch = self.factory.makeAnyBranch(
-            branch_type=BranchType.HOSTED, owner=self.requester)
-        branch = self.make_branch(db_branch.unique_name)
-        del self._branch_changed_log[:]
-        stacked_on_url = 'gopher://bazaar.launchpad.dev/~user/foo'
-        branch.lock_write()
-        branch.get_config().set_user_option(
-            'stacked_on_location', stacked_on_url)
-        branch.unlock()
-        self.assertEqual(1, len(self._branch_changed_log))
-        self.assertEqual(
-            stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
-        self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
+        self.assertStackedOnIsRewritten(
+            'gopher://bazaar.launchpad.dev/~user/foo',
+            'gopher://bazaar.launchpad.dev/~user/foo')
 
     def assertFormatStringsPassed(self, branch):
         self.assertEqual(1, len(self._branch_changed_log))

=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2013-04-05 04:26:19 +0000
+++ utilities/sourcedeps.cache	2013-08-16 05:37:28 +0000
@@ -4,28 +4,28 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20111114140506-6bmt9isw6lcud7yt"
     ], 
     "bzr-git": [
-        276, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20120627155618-3lv9t9jw3b5t9g6k"
+        277, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20130816045212-wbeztwl1mw1g461m"
     ], 
     "bzr-loom": [
         55, 
         "launchpad@xxxxxxxxxxxxxxxxx-20120830090804-cg49kky93htwax7s"
     ], 
     "bzr-svn": [
-        2724, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20120627153220-6ntxuuhdup7ie8ea"
+        2725, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20130816045016-wzr810hu2z459t4y"
     ], 
     "cscvs": [
-        432, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20100414131608-cf6jatd9zk6l6wpk"
+        433, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20130816043319-bts3l3bckmx431q1"
     ], 
     "difftacular": [
         6, 
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
     "dulwich": [
-        437, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20120627160422-60kkcr5wqn6ih1j1"
+        438, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20130816044524-j9a4yz0t6cidul2k"
     ], 
     "loggerhead": [
         480, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2013-04-05 04:26:19 +0000
+++ utilities/sourcedeps.conf	2013-08-16 05:37:28 +0000
@@ -8,11 +8,11 @@
 #########################################################
 
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=276
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=277
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=55
-bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2724
-cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=437
+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
+cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
+dulwich lp:~launchpad-pqm/dulwich/devel;revno=438
 difftacular lp:~launchpad/difftacular/trunk;revno=6
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=480
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23

=== modified file 'versions.cfg'
--- versions.cfg	2013-06-27 06:20:52 +0000
+++ versions.cfg	2013-08-16 05:37:28 +0000
@@ -16,7 +16,7 @@
 auditorfixture = 0.0.5
 BeautifulSoup = 3.2.1
 bson = 0.3.3
-bzr = 2.5.1
+bzr = 2.6.0
 celery = 2.5.1
 Chameleon = 2.11
 cssutils = 0.9.10