Launchpad itself

Merge lp:~wgrant/launchpad/bzr-2.6 into lp:launchpad

  1. bzr-2.6
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 16730
Proposed branch: lp:~wgrant/launchpad/bzr-2.6
Merge into: lp:launchpad
Diff against target: 177 lines (+37/-54)
5 files modified
lib/lp/code/bzr.py (+1/-1)
lib/lp/codehosting/vfs/tests/test_branchfs.py (+23/-40)
utilities/sourcedeps.cache (+8/-8)
utilities/sourcedeps.conf (+4/-4)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/bzr-2.6
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+180473@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2626
27from bzrlib.branch import (27from bzrlib.branch import (
28 BranchReferenceFormat,28 BranchReferenceFormat,
29 BzrBranchFormat5,
30 BzrBranchFormat6,29 BzrBranchFormat6,
31 BzrBranchFormat7,30 BzrBranchFormat7,
32 )31 )
32from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
33from bzrlib.bzrdir import (33from bzrlib.bzrdir import (
34 BzrDirMetaFormat1,34 BzrDirMetaFormat1,
35 BzrDirMetaFormat1Colo,35 BzrDirMetaFormat1Colo,
3636
=== 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 @@
954 revid,954 revid,
955 self._branch_changed_log[0]['last_revision'])955 self._branch_changed_log[0]['last_revision'])
956956
957 def assertStackedOnIsRewritten(self, input, output):
958 db_branch = self.factory.makeAnyBranch(
959 branch_type=BranchType.HOSTED, owner=self.requester)
960 branch = self.make_branch(db_branch.unique_name)
961 del self._branch_changed_log[:]
962 branch.lock_write()
963 branch._set_config_location('stacked_on_location', input)
964 branch.unlock()
965 # Clear the branch config cache to pick up the changes we made
966 # directly to the filesystem.
967 branch._get_config_store().unload()
968 self.assertEqual(output, branch.get_stacked_on_url())
969 self.assertEqual(1, len(self._branch_changed_log))
970 self.assertEqual(output, self._branch_changed_log[0]['stacked_on_url'])
971
957 def test_branch_unlock_relativizes_absolute_stacked_on_url(self):972 def test_branch_unlock_relativizes_absolute_stacked_on_url(self):
958 # When a branch that has been stacked on the absolute URL of another973 # When a branch that has been stacked on the absolute URL of another
959 # Launchpad branch is unlocked, the branch is mutated to be stacked on974 # Launchpad branch is unlocked, the branch is mutated to be stacked on
960 # the path part of that URL, and this relative path is passed to975 # the path part of that URL, and this relative path is passed to
961 # branchChanged().976 # branchChanged().
962 db_branch = self.factory.makeAnyBranch(977 self.assertStackedOnIsRewritten(
963 branch_type=BranchType.HOSTED, owner=self.requester)978 'http://bazaar.launchpad.dev/~user/product/branch',
964 branch = self.make_branch(db_branch.unique_name)979 '/~user/product/branch')
965 del self._branch_changed_log[:]
966 branch.lock_write()
967 branch.get_config().set_user_option(
968 'stacked_on_location',
969 'http://bazaar.launchpad.dev/~user/product/branch')
970 branch.unlock()
971 self.assertEqual('/~user/product/branch', branch.get_stacked_on_url())
972 self.assertEqual(1, len(self._branch_changed_log))
973 self.assertEqual(
974 '/~user/product/branch',
975 self._branch_changed_log[0]['stacked_on_url'])
976980
977 def test_branch_unlock_ignores_non_launchpad_stacked_url(self):981 def test_branch_unlock_ignores_non_launchpad_stacked_url(self):
978 # When a branch that has been stacked on the absolute URL of a branch982 # When a branch that has been stacked on the absolute URL of a branch
979 # that is not on Launchpad, it is passed unchanged to branchChanged().983 # that is not on Launchpad, it is passed unchanged to branchChanged().
980 db_branch = self.factory.makeAnyBranch(984 self.assertStackedOnIsRewritten(
981 branch_type=BranchType.HOSTED, owner=self.requester)985 'http://example.com/~user/foo', 'http://example.com/~user/foo')
982 branch = self.make_branch(db_branch.unique_name)
983 del self._branch_changed_log[:]
984 stacked_on_url = 'http://example.com/~user/foo'
985 branch.lock_write()
986 branch.get_config().set_user_option(
987 'stacked_on_location', stacked_on_url)
988 branch.unlock()
989 self.assertEqual(1, len(self._branch_changed_log))
990 self.assertEqual(
991 stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
992 self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
993986
994 def test_branch_unlock_ignores_odd_scheme_stacked_url(self):987 def test_branch_unlock_ignores_odd_scheme_stacked_url(self):
995 # When a branch that has been stacked on the absolute URL of a branch988 # When a branch that has been stacked on the absolute URL of a branch
996 # on Launchpad with a scheme we don't understand, it is passed989 # on Launchpad with a scheme we don't understand, it is passed
997 # unchanged to branchChanged().990 # unchanged to branchChanged().
998 db_branch = self.factory.makeAnyBranch(991 self.assertStackedOnIsRewritten(
999 branch_type=BranchType.HOSTED, owner=self.requester)992 'gopher://bazaar.launchpad.dev/~user/foo',
1000 branch = self.make_branch(db_branch.unique_name)993 'gopher://bazaar.launchpad.dev/~user/foo')
1001 del self._branch_changed_log[:]
1002 stacked_on_url = 'gopher://bazaar.launchpad.dev/~user/foo'
1003 branch.lock_write()
1004 branch.get_config().set_user_option(
1005 'stacked_on_location', stacked_on_url)
1006 branch.unlock()
1007 self.assertEqual(1, len(self._branch_changed_log))
1008 self.assertEqual(
1009 stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
1010 self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
1011994
1012 def assertFormatStringsPassed(self, branch):995 def assertFormatStringsPassed(self, branch):
1013 self.assertEqual(1, len(self._branch_changed_log))996 self.assertEqual(1, len(self._branch_changed_log))
1014997
=== 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 @@
4 "launchpad@pqm.canonical.com-20111114140506-6bmt9isw6lcud7yt"4 "launchpad@pqm.canonical.com-20111114140506-6bmt9isw6lcud7yt"
5 ], 5 ],
6 "bzr-git": [6 "bzr-git": [
7 276, 7 277,
8 "launchpad@pqm.canonical.com-20120627155618-3lv9t9jw3b5t9g6k"8 "launchpad@pqm.canonical.com-20130816045212-wbeztwl1mw1g461m"
9 ], 9 ],
10 "bzr-loom": [10 "bzr-loom": [
11 55, 11 55,
12 "launchpad@pqm.canonical.com-20120830090804-cg49kky93htwax7s"12 "launchpad@pqm.canonical.com-20120830090804-cg49kky93htwax7s"
13 ], 13 ],
14 "bzr-svn": [14 "bzr-svn": [
15 2724, 15 2725,
16 "launchpad@pqm.canonical.com-20120627153220-6ntxuuhdup7ie8ea"16 "launchpad@pqm.canonical.com-20130816045016-wzr810hu2z459t4y"
17 ], 17 ],
18 "cscvs": [18 "cscvs": [
19 432, 19 433,
20 "launchpad@pqm.canonical.com-20100414131608-cf6jatd9zk6l6wpk"20 "launchpad@pqm.canonical.com-20130816043319-bts3l3bckmx431q1"
21 ], 21 ],
22 "difftacular": [22 "difftacular": [
23 6, 23 6,
24 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"24 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"
25 ], 25 ],
26 "dulwich": [26 "dulwich": [
27 437, 27 438,
28 "launchpad@pqm.canonical.com-20120627160422-60kkcr5wqn6ih1j1"28 "launchpad@pqm.canonical.com-20130816044524-j9a4yz0t6cidul2k"
29 ], 29 ],
30 "loggerhead": [30 "loggerhead": [
31 480, 31 480,
3232
=== 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 @@
8#########################################################8#########################################################
99
10bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=7010bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
11bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=27611bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=277
12bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=5512bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=55
13bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=272413bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
14cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=43214cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
15dulwich lp:~launchpad-pqm/dulwich/devel;revno=43715dulwich lp:~launchpad-pqm/dulwich/devel;revno=438
16difftacular lp:~launchpad/difftacular/trunk;revno=616difftacular lp:~launchpad/difftacular/trunk;revno=6
17loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=48017loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=480
18lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=2318lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
1919
=== 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 @@
16auditorfixture = 0.0.516auditorfixture = 0.0.5
17BeautifulSoup = 3.2.117BeautifulSoup = 3.2.1
18bson = 0.3.318bson = 0.3.3
19bzr = 2.5.119bzr = 2.6.0
20celery = 2.5.120celery = 2.5.1
21Chameleon = 2.1121Chameleon = 2.11
22cssutils = 0.9.1022cssutils = 0.9.10