Merge lp:~vila/bzr/583667-lp-no-edge into lp:bzr/2.0

Proposed by Vincent Ladeuil on 2010-11-26
Status: Merged
Approved by: Vincent Ladeuil on 2010-11-30
Approved revision: 4768
Merged at revision: 4764
Proposed branch: lp:~vila/bzr/583667-lp-no-edge
Merge into: lp:bzr/2.0
Diff against target: 484 lines (+49/-56)
26 files modified
NEWS (+9/-1)
bzrlib/lockdir.py (+1/-1)
bzrlib/plugins/launchpad/__init__.py (+1/-1)
bzrlib/plugins/launchpad/lp_registration.py (+3/-6)
bzrlib/plugins/launchpad/test_lp_directory.py (+1/-1)
bzrlib/plugins/launchpad/test_lp_open.py (+4/-4)
bzrlib/plugins/launchpad/test_lp_service.py (+2/-14)
bzrlib/plugins/launchpad/test_register.py (+4/-4)
bzrlib/reconcile.py (+1/-1)
bzrlib/remote.py (+1/-1)
bzrlib/repository.py (+1/-1)
bzrlib/tests/__init__.py (+1/-1)
bzrlib/tests/blackbox/test_branch.py (+1/-1)
bzrlib/tests/blackbox/test_checkout.py (+1/-1)
bzrlib/tests/blackbox/test_commit.py (+1/-1)
bzrlib/tests/blackbox/test_merge.py (+1/-1)
bzrlib/tests/blackbox/test_reconfigure.py (+1/-1)
bzrlib/tests/per_tree/test_inv.py (+1/-1)
bzrlib/tests/per_workingtree/test_content_filters.py (+1/-1)
bzrlib/tests/test_errors.py (+1/-1)
bzrlib/tests/test_lockdir.py (+2/-2)
bzrlib/tests/test_osutils.py (+1/-1)
bzrlib/tests/test_remote.py (+1/-1)
bzrlib/tests/test_ui.py (+2/-2)
bzrlib/workingtree_4.py (+4/-4)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~vila/bzr/583667-lp-no-edge
Reviewer Review Type Date Requested Status
Martin Pool 2010-11-26 Needs Fixing on 2010-11-30
Review via email: mp+41958@code.launchpad.net

Commit Message

Get rid of edge.launchpad.net references.

Description of the Change

The ``edge.launchpad.net`` server is about to be/has been
deprecated. ``bzr`` is currently relying on it to transparently
resolve access to the edge or production servers. This is not
true anymore and instead we are now advised to to the opposite.

So this path fixes bug #583667 by removing all references to the
edge servers.

There are three parts:
* Fix a typo in a comment mentionning BZR_LP_XMLRPC_URL since
  that's how I started working on this bug.
* Totally delete all references to edge in the launchpad plugin
  and the corresponding tests.
* Fix all comments where bugs.edge.launchpad.net was used.

Code-wise, the relevant changes are in:
 bzrlib/plugins/launchpad/__init__.py
 bzrlib/plugins/launchpad/lp_registration.py

And for the tests in:
 bzrlib/plugins/launchpad/test_lp_directory.py
 bzrlib/plugins/launchpad/test_lp_open.py
 bzrlib/plugins/launchpad/test_lp_service.py
 bzrlib/plugins/launchpad/test_register.py

The other modifications are only in comments and don't need a
careful review.

I plan to merge this up in the other stable branches taking care
of conflicts and ensuring no other references were introduced.

To post a comment you must log in.
Robert Collins (lifeless) wrote :

I also see these references to edge:

./bzrlib/plugins/launchpad/lp_api.py: EDGE_SERVICE_ROOT,
./bzrlib/plugins/launchpad/lp_api.py: 'edge': EDGE_SERVICE_ROOT,
./bzrlib/plugins/launchpad/lp_api.py:
launchpadlib.launchpad.EDGE_SERVICE_ROOT.

Vincent Ladeuil (vila) wrote :

Thanks, but they are not in 2.0, I'm taking care of them while walking up to 2.3 (these one are in 2.1).

Martin Pool (mbp) wrote :

+* The ``edge.launchpad.net`` server has been deprecated and all references to
+ it have been removed from the code base. This ensures that users upgrading
+ to bzr 2.0.7 or better will never try to contact the 'edge' server. Users of
+ previous versions can workaround connection problems by setting the
+ ``BZR_LP_XMLRPC_URL`` environment variable to
+ ``http://xmlrpc.launchpad.net/bazaar/``. (Vincent Ladeuil, #583667)

I think the news entry should also link to the blog post explaining why we have to do this, for the sake of people justifying SRUs at least. (I realize you can reach it from the bug number but let's make it clear.)

The first sentence makes it sound like the server was deprecated in bzr.

  Launchpad has announced that the edge.launchpad.net instance is deprecated and may be shut down in the future <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore been updated in this release to talk to the main ('lpnet') servers, rather than edge.

I don't think that setting BZR_LP_XMLRPC_URL will be enough, because at least in later bzr releases we also use launchpadlib to talk to REST APIs.

I don't think there is a whatsnew in 2.0 but for series that have one we should mention this there too.

The code changes look ok to me.

review: Needs Fixing
Martin Pool (mbp) wrote :

> I also see these references to edge:
>
> ./bzrlib/plugins/launchpad/lp_api.py: EDGE_SERVICE_ROOT,
> ./bzrlib/plugins/launchpad/lp_api.py: 'edge': EDGE_SERVICE_ROOT,
> ./bzrlib/plugins/launchpad/lp_api.py:
> launchpadlib.launchpad.EDGE_SERVICE_ROOT.

Those just let you ask for edge if you want it. At least for the sake of developers we might as well keep them until edge is expunged from reality.

(Perhaps instead lplib should read an environment variable? bzr doesn't really need this code.)

Martin Packman (gz) wrote :

This looks like it has considerable overlap with lp:~gz/bzr/use_production_launchpad_581670 which is on trunk already so merging up may be a little interesting. I take it whatever broke lp-propose with production is long-since fixed?

Vincent Ladeuil (vila) wrote :

@Martin [gz]: yes, there is some overlap, but the merge went pretty darn well ;)

I hope what broke lp-propose has been fixed, but we'll hear about it soon enough. Anyway, I'll make different mps for 2.1, 2.2 and trunk to ensure we could discuss about relevant problems in relevant mps, lp-propose doesn't exist in 2.0, it has been introduced in 2.2.

@poolie: same goes for lp_api, introduced in 2.1

So I'll land this one for 2.0 first with the NEWS entry tweaked.

lp:~vila/bzr/583667-lp-no-edge updated on 2010-11-30
4768. By Vincent Ladeuil on 2010-11-30

Fix NEWS entry and one more 'edge' reference.

Vincent Ladeuil (vila) wrote :

> Those just let you ask for edge if you want it. At least for the sake of
> developers we might as well keep them until edge is expunged from reality.
>
> (Perhaps instead lplib should read an environment variable? bzr doesn't
> really need this code.)

Yup, I don't think bzr has to care about this corner case.

Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-10-08 09:10:20 +0000
3+++ NEWS 2010-11-30 16:04:22 +0000
4@@ -13,6 +13,14 @@
5 Compatibility Breaks
6 ********************
7
8+* Launchpad has announced that the ``edge.launchpad.net`` instance is
9+ deprecated and may be shut down in the future
10+ <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
11+ been updated in this release to talk to the main (``launchpad.net``) servers,
12+ rather than the ``edge`` ones. Users of previous versions can workaround
13+ connection problems by setting the ``BZR_LP_XMLRPC_URL`` environment variable
14+ to ``http://xmlrpc.launchpad.net/bazaar/``. (Vincent Ladeuil, #583667)
15+
16 New Features
17 ************
18
19@@ -923,7 +931,7 @@
20
21 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
22 supported at the moment on workingtree formats that can do content
23- filtering. (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
24+ filtering. (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
25 bzr now says so, rather than just ignoring the option. (Martin Pool)
26
27 * There was a bug in ``osutils.relpath`` that was only triggered on
28
29=== modified file 'bzrlib/lockdir.py'
30--- bzrlib/lockdir.py 2010-09-06 06:13:52 +0000
31+++ bzrlib/lockdir.py 2010-11-30 16:04:22 +0000
32@@ -242,7 +242,7 @@
33 # have a similar bug allowing someone to think they got the lock
34 # when it's already held.
35 #
36- # See <https://bugs.edge.launchpad.net/bzr/+bug/498378> for one case.
37+ # See <https://bugs.launchpad.net/bzr/+bug/498378> for one case.
38 #
39 # Strictly the check is unnecessary and a waste of time for most
40 # people, but probably worth trapping if something is wrong.
41
42=== modified file 'bzrlib/plugins/launchpad/__init__.py'
43--- bzrlib/plugins/launchpad/__init__.py 2009-07-06 13:00:23 +0000
44+++ bzrlib/plugins/launchpad/__init__.py 2010-11-30 16:04:22 +0000
45@@ -17,7 +17,7 @@
46 """Launchpad.net integration plugin for Bazaar."""
47
48 # The XMLRPC server address can be overridden by setting the environment
49-# variable $BZR_LP_XMLRPL_URL
50+# variable $BZR_LP_XMLRPC_URL
51
52 # see http://bazaar-vcs.org/Specs/BranchRegistrationTool
53
54
55=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
56--- bzrlib/plugins/launchpad/lp_registration.py 2009-07-04 16:22:16 +0000
57+++ bzrlib/plugins/launchpad/lp_registration.py 2010-11-30 16:04:22 +0000
58@@ -61,7 +61,6 @@
59
60 LAUNCHPAD_DOMAINS = {
61 'production': 'launchpad.net',
62- 'edge': 'edge.launchpad.net',
63 'staging': 'staging.launchpad.net',
64 'demo': 'demo.launchpad.net',
65 'dev': 'launchpad.dev',
66@@ -73,11 +72,9 @@
67 for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
68 LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
69
70- # We use edge as the default because:
71- # Beta users get redirected to it
72- # All users can use it
73- # There is a bug in the launchpad side where redirection causes an OOPS.
74- DEFAULT_INSTANCE = 'edge'
75+ # We use production as the default because edge has been deprecated circa
76+ # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
77+ DEFAULT_INSTANCE = 'production'
78 DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
79
80 transport = None
81
82=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
83--- bzrlib/plugins/launchpad/test_lp_directory.py 2009-03-23 14:59:43 +0000
84+++ bzrlib/plugins/launchpad/test_lp_directory.py 2010-11-30 16:04:22 +0000
85@@ -61,7 +61,7 @@
86 self.assertEquals('http://bazaar.launchpad.net/~apt/apt/devel',
87 directory._resolve('lp:apt', factory))
88 # Make sure that resolve went to the production server.
89- self.assertEquals('https://xmlrpc.edge.launchpad.net/bazaar/',
90+ self.assertEquals('https://xmlrpc.launchpad.net/bazaar/',
91 factory._service_url)
92
93 def test_staging(self):
94
95=== modified file 'bzrlib/plugins/launchpad/test_lp_open.py'
96--- bzrlib/plugins/launchpad/test_lp_open.py 2009-03-23 14:59:43 +0000
97+++ bzrlib/plugins/launchpad/test_lp_open.py 2010-11-30 16:04:22 +0000
98@@ -53,7 +53,7 @@
99 branch.set_public_branch(
100 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
101 self.assertEqual(
102- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
103+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
104 'browser'],
105 self.run_open('lp'))
106
107@@ -64,7 +64,7 @@
108 branch.set_push_location(
109 'bzr+ssh://bazaar.launchpad.net/~foo/bar/push')
110 self.assertEqual(
111- ['Opening https://code.edge.launchpad.net/~foo/bar/public in web '
112+ ['Opening https://code.launchpad.net/~foo/bar/public in web '
113 'browser'],
114 self.run_open('lp'))
115
116@@ -75,7 +75,7 @@
117 branch.set_push_location(
118 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
119 self.assertEqual(
120- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
121+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
122 'browser'],
123 self.run_open('lp'))
124
125@@ -84,6 +84,6 @@
126 # location and no push location, then just try to look up the
127 # Launchpad page for that URL.
128 self.assertEqual(
129- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
130+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
131 'browser'],
132 self.run_open('bzr+ssh://bazaar.launchpad.net/~foo/bar/baz'))
133
134=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
135--- bzrlib/plugins/launchpad/test_lp_service.py 2009-03-23 14:59:43 +0000
136+++ bzrlib/plugins/launchpad/test_lp_service.py 2010-11-30 16:04:22 +0000
137@@ -54,11 +54,6 @@
138 self.assertEqual('https://xmlrpc.staging.launchpad.net/bazaar/',
139 service.service_url)
140
141- def test_edge_service(self):
142- service = LaunchpadService(lp_instance='edge')
143- self.assertEqual('https://xmlrpc.edge.launchpad.net/bazaar/',
144- service.service_url)
145-
146 def test_dev_service(self):
147 service = LaunchpadService(lp_instance='dev')
148 self.assertEqual('https://xmlrpc.launchpad.dev/bazaar/',
149@@ -97,7 +92,7 @@
150 web_url = service.get_web_url_from_branch_url(
151 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
152 self.assertEqual(
153- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
154+ 'https://code.launchpad.net/~foo/bar/baz', web_url)
155
156 def test_product_bzr_ssh_url(self):
157 service = LaunchpadService(lp_instance='production')
158@@ -152,7 +147,7 @@
159 dict(urls=['http://bazaar.launchpad.net/~foo/bar/baz']))
160 web_url = service.get_web_url_from_branch_url('lp:foo', factory)
161 self.assertEqual(
162- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
163+ 'https://code.launchpad.net/~foo/bar/baz', web_url)
164
165 def test_lp_branch_fault(self):
166 service = LaunchpadService()
167@@ -171,13 +166,6 @@
168 self.assertEqual(
169 'https://code.staging.launchpad.net/~foo/bar/baz', web_url)
170
171- def test_edge_url(self):
172- service = LaunchpadService(lp_instance='edge')
173- web_url = service.get_web_url_from_branch_url(
174- 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
175- self.assertEqual(
176- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
177-
178 def test_dev_url(self):
179 service = LaunchpadService(lp_instance='dev')
180 web_url = service.get_web_url_from_branch_url(
181
182=== modified file 'bzrlib/plugins/launchpad/test_register.py'
183--- bzrlib/plugins/launchpad/test_register.py 2009-06-10 03:56:49 +0000
184+++ bzrlib/plugins/launchpad/test_register.py 2010-11-30 16:04:22 +0000
185@@ -175,7 +175,7 @@
186 self.assertEquals(out, 'Branch registered.\n')
187
188 def test_onto_transport(self):
189- """Test how the request is sent by transmitting across a mock Transport"""
190+ """How the request is sent by transmitting across a mock Transport"""
191 # use a real transport, but intercept at the http/xml layer
192 transport = InstrumentedXMLRPCTransport(self, expect_auth=True)
193 service = LaunchpadService(transport)
194@@ -188,7 +188,7 @@
195 'author@launchpad.net',
196 'product')
197 rego.submit(service)
198- self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
199+ self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
200 self.assertEquals(len(transport.sent_params), 6)
201 self.assertEquals(transport.sent_params,
202 ('http://test-server.com/bzr/branch', # branch_url
203@@ -200,12 +200,12 @@
204 self.assertTrue(transport.got_request)
205
206 def test_onto_transport_unauthenticated(self):
207- """Test how an unauthenticated request is transmitted across a mock Transport"""
208+ """An unauthenticated request is transmitted across a mock Transport"""
209 transport = InstrumentedXMLRPCTransport(self, expect_auth=False)
210 service = LaunchpadService(transport)
211 resolve = ResolveLaunchpadPathRequest('bzr')
212 resolve.submit(service)
213- self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
214+ self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
215 self.assertEquals(len(transport.sent_params), 1)
216 self.assertEquals(transport.sent_params, ('bzr', ))
217 self.assertTrue(transport.got_request)
218
219=== modified file 'bzrlib/reconcile.py'
220--- bzrlib/reconcile.py 2009-07-31 22:48:55 +0000
221+++ bzrlib/reconcile.py 2010-11-30 16:04:22 +0000
222@@ -494,7 +494,7 @@
223 # - lock the names list
224 # - perform a customised pack() that regenerates data as needed
225 # - unlock the names list
226- # https://bugs.edge.launchpad.net/bzr/+bug/154173
227+ # https://bugs.launchpad.net/bzr/+bug/154173
228
229 def _reconcile_steps(self):
230 """Perform the steps to reconcile this repository."""
231
232=== modified file 'bzrlib/remote.py'
233--- bzrlib/remote.py 2010-04-23 05:30:32 +0000
234+++ bzrlib/remote.py 2010-11-30 16:04:22 +0000
235@@ -824,7 +824,7 @@
236 def _has_same_fallbacks(self, other_repo):
237 """Returns true if the repositories have the same fallbacks."""
238 # XXX: copied from Repository; it should be unified into a base class
239- # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
240+ # <https://bugs.launchpad.net/bzr/+bug/401622>
241 my_fb = self._fallback_repositories
242 other_fb = other_repo._fallback_repositories
243 if len(my_fb) != len(other_fb):
244
245=== modified file 'bzrlib/repository.py'
246--- bzrlib/repository.py 2010-02-25 04:31:05 +0000
247+++ bzrlib/repository.py 2010-11-30 16:04:22 +0000
248@@ -1678,7 +1678,7 @@
249 "May not fetch while in a write group.")
250 # fast path same-url fetch operations
251 # TODO: lift out to somewhere common with RemoteRepository
252- # <https://bugs.edge.launchpad.net/bzr/+bug/401646>
253+ # <https://bugs.launchpad.net/bzr/+bug/401646>
254 if (self.has_same_location(source)
255 and fetch_spec is None
256 and self._has_same_fallbacks(source)):
257
258=== modified file 'bzrlib/tests/__init__.py'
259--- bzrlib/tests/__init__.py 2010-07-16 13:06:04 +0000
260+++ bzrlib/tests/__init__.py 2010-11-30 16:04:22 +0000
261@@ -755,7 +755,7 @@
262 # XXX: Should probably unify more with CannedInputUIFactory or a
263 # particular configuration of TextUIFactory, or otherwise have a clearer
264 # idea of how they're supposed to be different.
265- # See https://bugs.edge.launchpad.net/bzr/+bug/408213
266+ # See https://bugs.launchpad.net/bzr/+bug/408213
267
268 def __init__(self, stdout=None, stderr=None, stdin=None):
269 if stdin is not None:
270
271=== modified file 'bzrlib/tests/blackbox/test_branch.py'
272--- bzrlib/tests/blackbox/test_branch.py 2010-02-24 08:03:07 +0000
273+++ bzrlib/tests/blackbox/test_branch.py 2010-11-30 16:04:22 +0000
274@@ -175,7 +175,7 @@
275 if same_file:
276 pass
277 else:
278- # https://bugs.edge.launchpad.net/bzr/+bug/408193
279+ # https://bugs.launchpad.net/bzr/+bug/408193
280 self.assertContainsRe(err, "hardlinking working copy files is "
281 "not currently supported")
282 raise KnownFailure("--hardlink doesn't work in formats "
283
284=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
285--- bzrlib/tests/blackbox/test_checkout.py 2009-08-03 04:19:03 +0000
286+++ bzrlib/tests/blackbox/test_checkout.py 2010-11-30 16:04:22 +0000
287@@ -164,7 +164,7 @@
288 if same_file:
289 pass
290 else:
291- # https://bugs.edge.launchpad.net/bzr/+bug/408193
292+ # https://bugs.launchpad.net/bzr/+bug/408193
293 self.assertContainsRe(err, "hardlinking working copy files is "
294 "not currently supported")
295 raise KnownFailure("--hardlink doesn't work in formats "
296
297=== modified file 'bzrlib/tests/blackbox/test_commit.py'
298--- bzrlib/tests/blackbox/test_commit.py 2009-08-26 03:20:32 +0000
299+++ bzrlib/tests/blackbox/test_commit.py 2010-11-30 16:04:22 +0000
300@@ -608,7 +608,7 @@
301 self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
302
303 def test_commit_readonly_checkout(self):
304- # https://bugs.edge.launchpad.net/bzr/+bug/129701
305+ # https://bugs.launchpad.net/bzr/+bug/129701
306 # "UnlockableTransport error trying to commit in checkout of readonly
307 # branch"
308 self.make_branch('master')
309
310=== modified file 'bzrlib/tests/blackbox/test_merge.py'
311--- bzrlib/tests/blackbox/test_merge.py 2009-08-06 06:58:09 +0000
312+++ bzrlib/tests/blackbox/test_merge.py 2010-11-30 16:04:22 +0000
313@@ -375,7 +375,7 @@
314 def test_directive_cherrypick(self):
315 source = self.make_branch_and_tree('source')
316 source.commit("nothing")
317- # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
318+ # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
319 # cherrypick from one branch into another unrelated branch with a
320 # different root id will give shape conflicts. as a workaround we
321 # make sure they share the same root id.
322
323=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
324--- bzrlib/tests/blackbox/test_reconfigure.py 2009-07-10 08:18:28 +0000
325+++ bzrlib/tests/blackbox/test_reconfigure.py 2010-11-30 16:04:22 +0000
326@@ -197,7 +197,7 @@
327 * then make the second unstacked, so it has to fill in history from
328 the original fallback lying underneath its original content
329
330- See discussion in <https://bugs.edge.launchpad.net/bzr/+bug/391411>
331+ See discussion in <https://bugs.launchpad.net/bzr/+bug/391411>
332 """
333 # there are also per_branch tests that exercise remote operation etc
334 tree_1 = self.make_branch_and_tree('b1', format='2a')
335
336=== modified file 'bzrlib/tests/per_tree/test_inv.py'
337--- bzrlib/tests/per_tree/test_inv.py 2010-02-12 03:33:36 +0000
338+++ bzrlib/tests/per_tree/test_inv.py 2010-11-30 16:04:22 +0000
339@@ -170,7 +170,7 @@
340 work_tree.get_canonical_inventory_path('Dir/None'))
341
342 def test_canonical_tree_name_mismatch(self):
343- # see <https://bugs.edge.launchpad.net/bzr/+bug/368931>
344+ # see <https://bugs.launchpad.net/bzr/+bug/368931>
345 # some of the trees we want to use can only exist on a disk, not in
346 # memory - therefore we can only test this if the filesystem is
347 # case-sensitive.
348
349=== modified file 'bzrlib/tests/per_workingtree/test_content_filters.py'
350--- bzrlib/tests/per_workingtree/test_content_filters.py 2009-10-28 23:34:13 +0000
351+++ bzrlib/tests/per_workingtree/test_content_filters.py 2010-11-30 16:04:22 +0000
352@@ -227,7 +227,7 @@
353
354 def test_path_content_summary(self):
355 """path_content_summary should always talk about the canonical form."""
356- # see https://bugs.edge.launchpad.net/bzr/+bug/415508
357+ # see https://bugs.launchpad.net/bzr/+bug/415508
358 #
359 # set up a tree where the canonical form has a string added to the
360 # end
361
362=== modified file 'bzrlib/tests/test_errors.py'
363--- bzrlib/tests/test_errors.py 2010-09-06 06:13:52 +0000
364+++ bzrlib/tests/test_errors.py 2010-11-30 16:04:22 +0000
365@@ -678,7 +678,7 @@
366 str(e), 'Unprintable exception ErrorWithBadFormat')
367
368 def test_cannot_bind_address(self):
369- # see <https://bugs.edge.launchpad.net/bzr/+bug/286871>
370+ # see <https://bugs.launchpad.net/bzr/+bug/286871>
371 e = errors.CannotBindAddress('example.com', 22,
372 socket.error(13, 'Permission denied'))
373 self.assertContainsRe(str(e),
374
375=== modified file 'bzrlib/tests/test_lockdir.py'
376--- bzrlib/tests/test_lockdir.py 2010-09-06 06:13:52 +0000
377+++ bzrlib/tests/test_lockdir.py 2010-11-30 16:04:22 +0000
378@@ -728,7 +728,7 @@
379 def test_no_lockdir_info(self):
380 """We can cope with empty info files."""
381 # This seems like a fairly common failure case - see
382- # <https://bugs.edge.launchpad.net/bzr/+bug/185103> and all its dupes.
383+ # <https://bugs.launchpad.net/bzr/+bug/185103> and all its dupes.
384 # Processes are often interrupted after opening the file
385 # before the actual contents are committed.
386 t = self.get_transport()
387@@ -747,7 +747,7 @@
388 def test_corrupt_lockdir_info(self):
389 """We can cope with corrupt (and thus unparseable) info files."""
390 # This seems like a fairly common failure case too - see
391- # <https://bugs.edge.launchpad.net/bzr/+bug/619872> for instance.
392+ # <https://bugs.launchpad.net/bzr/+bug/619872> for instance.
393 # In particular some systems tend to fill recently created files with
394 # nul bytes after recovering from a system crash.
395 t = self.get_transport()
396
397=== modified file 'bzrlib/tests/test_osutils.py'
398--- bzrlib/tests/test_osutils.py 2009-10-08 17:13:24 +0000
399+++ bzrlib/tests/test_osutils.py 2010-11-30 16:04:22 +0000
400@@ -1042,7 +1042,7 @@
401 self.assertExpectedBlocks(expected_dirblocks[1:], result)
402
403 def test_walkdirs_os_error(self):
404- # <https://bugs.edge.launchpad.net/bzr/+bug/338653>
405+ # <https://bugs.launchpad.net/bzr/+bug/338653>
406 # Pyrex readdir didn't raise useful messages if it had an error
407 # reading the directory
408 if sys.platform == 'win32':
409
410=== modified file 'bzrlib/tests/test_remote.py'
411--- bzrlib/tests/test_remote.py 2010-04-23 05:30:32 +0000
412+++ bzrlib/tests/test_remote.py 2010-11-30 16:04:22 +0000
413@@ -1534,7 +1534,7 @@
414 def test_get_multi_line_branch_conf(self):
415 # Make sure that multiple-line branch.conf files are supported
416 #
417- # https://bugs.edge.launchpad.net/bzr/+bug/354075
418+ # https://bugs.launchpad.net/bzr/+bug/354075
419 client = FakeClient()
420 client.add_expected_call(
421 'Branch.get_stacked_on_url', ('memory:///',),
422
423=== modified file 'bzrlib/tests/test_ui.py'
424--- bzrlib/tests/test_ui.py 2010-02-25 05:46:32 +0000
425+++ bzrlib/tests/test_ui.py 2010-11-30 16:04:22 +0000
426@@ -366,7 +366,7 @@
427
428 def test_test_ui_factory_progress(self):
429 # there's no output; we just want to make sure this doesn't crash -
430- # see https://bugs.edge.launchpad.net/bzr/+bug/408201
431+ # see https://bugs.launchpad.net/bzr/+bug/408201
432 ui = TestUIFactory()
433 pb = ui.nested_progress_bar()
434 pb.update('hello')
435@@ -375,7 +375,7 @@
436
437
438 class CannedInputUIFactoryTests(TestCase):
439-
440+
441 def test_canned_input_get_input(self):
442 uif = CannedInputUIFactory([True, 'mbp', 'password'])
443 self.assertEqual(uif.get_boolean('Extra cheese?'), True)
444
445=== modified file 'bzrlib/workingtree_4.py'
446--- bzrlib/workingtree_4.py 2010-07-13 10:21:19 +0000
447+++ bzrlib/workingtree_4.py 2010-11-30 16:04:22 +0000
448@@ -1319,7 +1319,7 @@
449 def _file_content_summary(self, path, stat_result):
450 # This is to support the somewhat obsolete path_content_summary method
451 # with content filtering: see
452- # <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
453+ # <https://bugs.launchpad.net/bzr/+bug/415508>.
454 #
455 # If the dirstate cache is up to date and knows the hash and size,
456 # return that.
457@@ -1459,9 +1459,9 @@
458 # the source tree.
459 if wt.supports_content_filtering():
460 if hardlink:
461- # see https://bugs.edge.launchpad.net/bzr/+bug/408193
462- trace.warning("hardlinking working copy files is not currently "
463- "supported in %r" % (wt,))
464+ # see https://bugs.launchpad.net/bzr/+bug/408193
465+ trace.warning('hardlinking working copy files is not'
466+ ' currently supported in %r' % (wt,))
467 accelerator_tree = None
468 delta_from_tree = False
469 else:
470
471=== modified file 'setup.py'
472--- setup.py 2010-01-12 01:44:13 +0000
473+++ setup.py 2010-11-30 16:04:22 +0000
474@@ -283,8 +283,8 @@
475 # The code it generates re-uses a "local" pointer and
476 # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
477 # which is NULL safe with PY_DECREF which is not.)
478- # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
479- # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
480+ # <https://bugs.launchpad.net/bzr/+bug/449372>
481+ # <https://bugs.launchpad.net/bzr/+bug/276868>
482 print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
483 print 'your version of pyrex "%s". Please upgrade your pyrex' % (
484 pyrex_version,)

Subscribers

People subscribed via source and target branches