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

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
1=== modified file 'lib/lp/code/bzr.py'
2--- lib/lp/code/bzr.py 2012-08-30 14:52:37 +0000
3+++ lib/lp/code/bzr.py 2013-08-16 05:37:28 +0000
4@@ -26,10 +26,10 @@
5
6 from bzrlib.branch import (
7 BranchReferenceFormat,
8- BzrBranchFormat5,
9 BzrBranchFormat6,
10 BzrBranchFormat7,
11 )
12+from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
13 from bzrlib.bzrdir import (
14 BzrDirMetaFormat1,
15 BzrDirMetaFormat1Colo,
16
17=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfs.py'
18--- lib/lp/codehosting/vfs/tests/test_branchfs.py 2013-01-07 02:40:55 +0000
19+++ lib/lp/codehosting/vfs/tests/test_branchfs.py 2013-08-16 05:37:28 +0000
20@@ -954,60 +954,43 @@
21 revid,
22 self._branch_changed_log[0]['last_revision'])
23
24+ def assertStackedOnIsRewritten(self, input, output):
25+ db_branch = self.factory.makeAnyBranch(
26+ branch_type=BranchType.HOSTED, owner=self.requester)
27+ branch = self.make_branch(db_branch.unique_name)
28+ del self._branch_changed_log[:]
29+ branch.lock_write()
30+ branch._set_config_location('stacked_on_location', input)
31+ branch.unlock()
32+ # Clear the branch config cache to pick up the changes we made
33+ # directly to the filesystem.
34+ branch._get_config_store().unload()
35+ self.assertEqual(output, branch.get_stacked_on_url())
36+ self.assertEqual(1, len(self._branch_changed_log))
37+ self.assertEqual(output, self._branch_changed_log[0]['stacked_on_url'])
38+
39 def test_branch_unlock_relativizes_absolute_stacked_on_url(self):
40 # When a branch that has been stacked on the absolute URL of another
41 # Launchpad branch is unlocked, the branch is mutated to be stacked on
42 # the path part of that URL, and this relative path is passed to
43 # branchChanged().
44- db_branch = self.factory.makeAnyBranch(
45- branch_type=BranchType.HOSTED, owner=self.requester)
46- branch = self.make_branch(db_branch.unique_name)
47- del self._branch_changed_log[:]
48- branch.lock_write()
49- branch.get_config().set_user_option(
50- 'stacked_on_location',
51- 'http://bazaar.launchpad.dev/~user/product/branch')
52- branch.unlock()
53- self.assertEqual('/~user/product/branch', branch.get_stacked_on_url())
54- self.assertEqual(1, len(self._branch_changed_log))
55- self.assertEqual(
56- '/~user/product/branch',
57- self._branch_changed_log[0]['stacked_on_url'])
58+ self.assertStackedOnIsRewritten(
59+ 'http://bazaar.launchpad.dev/~user/product/branch',
60+ '/~user/product/branch')
61
62 def test_branch_unlock_ignores_non_launchpad_stacked_url(self):
63 # When a branch that has been stacked on the absolute URL of a branch
64 # that is not on Launchpad, it is passed unchanged to branchChanged().
65- db_branch = self.factory.makeAnyBranch(
66- branch_type=BranchType.HOSTED, owner=self.requester)
67- branch = self.make_branch(db_branch.unique_name)
68- del self._branch_changed_log[:]
69- stacked_on_url = 'http://example.com/~user/foo'
70- branch.lock_write()
71- branch.get_config().set_user_option(
72- 'stacked_on_location', stacked_on_url)
73- branch.unlock()
74- self.assertEqual(1, len(self._branch_changed_log))
75- self.assertEqual(
76- stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
77- self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
78+ self.assertStackedOnIsRewritten(
79+ 'http://example.com/~user/foo', 'http://example.com/~user/foo')
80
81 def test_branch_unlock_ignores_odd_scheme_stacked_url(self):
82 # When a branch that has been stacked on the absolute URL of a branch
83 # on Launchpad with a scheme we don't understand, it is passed
84 # unchanged to branchChanged().
85- db_branch = self.factory.makeAnyBranch(
86- branch_type=BranchType.HOSTED, owner=self.requester)
87- branch = self.make_branch(db_branch.unique_name)
88- del self._branch_changed_log[:]
89- stacked_on_url = 'gopher://bazaar.launchpad.dev/~user/foo'
90- branch.lock_write()
91- branch.get_config().set_user_option(
92- 'stacked_on_location', stacked_on_url)
93- branch.unlock()
94- self.assertEqual(1, len(self._branch_changed_log))
95- self.assertEqual(
96- stacked_on_url, self._branch_changed_log[0]['stacked_on_url'])
97- self.assertEqual(stacked_on_url, branch.get_stacked_on_url())
98+ self.assertStackedOnIsRewritten(
99+ 'gopher://bazaar.launchpad.dev/~user/foo',
100+ 'gopher://bazaar.launchpad.dev/~user/foo')
101
102 def assertFormatStringsPassed(self, branch):
103 self.assertEqual(1, len(self._branch_changed_log))
104
105=== modified file 'utilities/sourcedeps.cache'
106--- utilities/sourcedeps.cache 2013-04-05 04:26:19 +0000
107+++ utilities/sourcedeps.cache 2013-08-16 05:37:28 +0000
108@@ -4,28 +4,28 @@
109 "launchpad@pqm.canonical.com-20111114140506-6bmt9isw6lcud7yt"
110 ],
111 "bzr-git": [
112- 276,
113- "launchpad@pqm.canonical.com-20120627155618-3lv9t9jw3b5t9g6k"
114+ 277,
115+ "launchpad@pqm.canonical.com-20130816045212-wbeztwl1mw1g461m"
116 ],
117 "bzr-loom": [
118 55,
119 "launchpad@pqm.canonical.com-20120830090804-cg49kky93htwax7s"
120 ],
121 "bzr-svn": [
122- 2724,
123- "launchpad@pqm.canonical.com-20120627153220-6ntxuuhdup7ie8ea"
124+ 2725,
125+ "launchpad@pqm.canonical.com-20130816045016-wzr810hu2z459t4y"
126 ],
127 "cscvs": [
128- 432,
129- "launchpad@pqm.canonical.com-20100414131608-cf6jatd9zk6l6wpk"
130+ 433,
131+ "launchpad@pqm.canonical.com-20130816043319-bts3l3bckmx431q1"
132 ],
133 "difftacular": [
134 6,
135 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"
136 ],
137 "dulwich": [
138- 437,
139- "launchpad@pqm.canonical.com-20120627160422-60kkcr5wqn6ih1j1"
140+ 438,
141+ "launchpad@pqm.canonical.com-20130816044524-j9a4yz0t6cidul2k"
142 ],
143 "loggerhead": [
144 480,
145
146=== modified file 'utilities/sourcedeps.conf'
147--- utilities/sourcedeps.conf 2013-04-05 04:26:19 +0000
148+++ utilities/sourcedeps.conf 2013-08-16 05:37:28 +0000
149@@ -8,11 +8,11 @@
150 #########################################################
151
152 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
153-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=276
154+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=277
155 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=55
156-bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2724
157-cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
158-dulwich lp:~launchpad-pqm/dulwich/devel;revno=437
159+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
160+cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
161+dulwich lp:~launchpad-pqm/dulwich/devel;revno=438
162 difftacular lp:~launchpad/difftacular/trunk;revno=6
163 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=480
164 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
165
166=== modified file 'versions.cfg'
167--- versions.cfg 2013-06-27 06:20:52 +0000
168+++ versions.cfg 2013-08-16 05:37:28 +0000
169@@ -16,7 +16,7 @@
170 auditorfixture = 0.0.5
171 BeautifulSoup = 3.2.1
172 bson = 0.3.3
173-bzr = 2.5.1
174+bzr = 2.6.0
175 celery = 2.5.1
176 Chameleon = 2.11
177 cssutils = 0.9.10