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

[Vincent Ladeuil]

Get rid of edge.launchpad.net references.

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.

[Robert Collins (lifeless)]

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)]

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)]

+* 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)]

> 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)]

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)]

@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.

[Vincent Ladeuil (vila)]

> 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)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-10-08 09:10:20 +0000
+++ NEWS	2010-11-30 16:04:22 +0000
@@ -13,6 +13,14 @@
 Compatibility Breaks
 ********************
 
+* 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 (``launchpad.net``) servers,
+  rather than the ``edge`` ones. 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)
+
 New Features
 ************
 
@@ -923,7 +931,7 @@
   
 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
   supported at the moment on workingtree formats that can do content
-  filtering.  (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
+  filtering.  (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
   bzr now says so, rather than just ignoring the option.  (Martin Pool)
 
 * There was a bug in ``osutils.relpath`` that was only triggered on
 
=== modified file 'bzrlib/lockdir.py'
--- bzrlib/lockdir.py	2010-09-06 06:13:52 +0000
+++ bzrlib/lockdir.py	2010-11-30 16:04:22 +0000
@@ -242,7 +242,7 @@
         # have a similar bug allowing someone to think they got the lock
         # when it's already held.
         #
-        # See <https://bugs.edge.launchpad.net/bzr/+bug/498378> for one case.
+        # See <https://bugs.launchpad.net/bzr/+bug/498378> for one case.
         #
         # Strictly the check is unnecessary and a waste of time for most
         # people, but probably worth trapping if something is wrong.
 
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- bzrlib/plugins/launchpad/__init__.py	2009-07-06 13:00:23 +0000
+++ bzrlib/plugins/launchpad/__init__.py	2010-11-30 16:04:22 +0000
@@ -17,7 +17,7 @@
 """Launchpad.net integration plugin for Bazaar."""
 
 # The XMLRPC server address can be overridden by setting the environment
-# variable $BZR_LP_XMLRPL_URL
+# variable $BZR_LP_XMLRPC_URL
 
 # see http://bazaar-vcs.org/Specs/BranchRegistrationTool
 
 
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- bzrlib/plugins/launchpad/lp_registration.py	2009-07-04 16:22:16 +0000
+++ bzrlib/plugins/launchpad/lp_registration.py	2010-11-30 16:04:22 +0000
@@ -61,7 +61,6 @@
 
     LAUNCHPAD_DOMAINS = {
         'production': 'launchpad.net',
-        'edge': 'edge.launchpad.net',
         'staging': 'staging.launchpad.net',
         'demo': 'demo.launchpad.net',
         'dev': 'launchpad.dev',
@@ -73,11 +72,9 @@
     for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
         LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
 
-    # We use edge as the default because:
-    # Beta users get redirected to it
-    # All users can use it
-    # There is a bug in the launchpad side where redirection causes an OOPS.
-    DEFAULT_INSTANCE = 'edge'
+    # We use production as the default because edge has been deprecated circa
+    # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
+    DEFAULT_INSTANCE = 'production'
     DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
 
     transport = None
 
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2009-03-23 14:59:43 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2010-11-30 16:04:22 +0000
@@ -61,7 +61,7 @@
         self.assertEquals('http://bazaar.launchpad.net/~apt/apt/devel',
                           directory._resolve('lp:apt', factory))
         # Make sure that resolve went to the production server.
-        self.assertEquals('https://xmlrpc.edge.launchpad.net/bazaar/',
+        self.assertEquals('https://xmlrpc.launchpad.net/bazaar/',
                           factory._service_url)
 
     def test_staging(self):
 
=== modified file 'bzrlib/plugins/launchpad/test_lp_open.py'
--- bzrlib/plugins/launchpad/test_lp_open.py	2009-03-23 14:59:43 +0000
+++ bzrlib/plugins/launchpad/test_lp_open.py	2010-11-30 16:04:22 +0000
@@ -53,7 +53,7 @@
         branch.set_public_branch(
             'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
         self.assertEqual(
-            ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+            ['Opening https://code.launchpad.net/~foo/bar/baz in web '
              'browser'],
             self.run_open('lp'))
 
@@ -64,7 +64,7 @@
         branch.set_push_location(
             'bzr+ssh://bazaar.launchpad.net/~foo/bar/push')
         self.assertEqual(
-            ['Opening https://code.edge.launchpad.net/~foo/bar/public in web '
+            ['Opening https://code.launchpad.net/~foo/bar/public in web '
              'browser'],
             self.run_open('lp'))
 
@@ -75,7 +75,7 @@
         branch.set_push_location(
             'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
         self.assertEqual(
-            ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+            ['Opening https://code.launchpad.net/~foo/bar/baz in web '
              'browser'],
             self.run_open('lp'))
 
@@ -84,6 +84,6 @@
         # location and no push location, then just try to look up the
         # Launchpad page for that URL.
         self.assertEqual(
-            ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+            ['Opening https://code.launchpad.net/~foo/bar/baz in web '
              'browser'],
             self.run_open('bzr+ssh://bazaar.launchpad.net/~foo/bar/baz'))
 
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
--- bzrlib/plugins/launchpad/test_lp_service.py	2009-03-23 14:59:43 +0000
+++ bzrlib/plugins/launchpad/test_lp_service.py	2010-11-30 16:04:22 +0000
@@ -54,11 +54,6 @@
         self.assertEqual('https://xmlrpc.staging.launchpad.net/bazaar/',
                          service.service_url)
 
-    def test_edge_service(self):
-        service = LaunchpadService(lp_instance='edge')
-        self.assertEqual('https://xmlrpc.edge.launchpad.net/bazaar/',
-                         service.service_url)
-
     def test_dev_service(self):
         service = LaunchpadService(lp_instance='dev')
         self.assertEqual('https://xmlrpc.launchpad.dev/bazaar/',
@@ -97,7 +92,7 @@
         web_url = service.get_web_url_from_branch_url(
             'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
         self.assertEqual(
-            'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
+            'https://code.launchpad.net/~foo/bar/baz', web_url)
 
     def test_product_bzr_ssh_url(self):
         service = LaunchpadService(lp_instance='production')
@@ -152,7 +147,7 @@
             dict(urls=['http://bazaar.launchpad.net/~foo/bar/baz']))
         web_url = service.get_web_url_from_branch_url('lp:foo', factory)
         self.assertEqual(
-            'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
+            'https://code.launchpad.net/~foo/bar/baz', web_url)
 
     def test_lp_branch_fault(self):
         service = LaunchpadService()
@@ -171,13 +166,6 @@
         self.assertEqual(
             'https://code.staging.launchpad.net/~foo/bar/baz', web_url)
 
-    def test_edge_url(self):
-        service = LaunchpadService(lp_instance='edge')
-        web_url = service.get_web_url_from_branch_url(
-            'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
-        self.assertEqual(
-            'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
-
     def test_dev_url(self):
         service = LaunchpadService(lp_instance='dev')
         web_url = service.get_web_url_from_branch_url(
 
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- bzrlib/plugins/launchpad/test_register.py	2009-06-10 03:56:49 +0000
+++ bzrlib/plugins/launchpad/test_register.py	2010-11-30 16:04:22 +0000
@@ -175,7 +175,7 @@
         self.assertEquals(out, 'Branch registered.\n')
 
     def test_onto_transport(self):
-        """Test how the request is sent by transmitting across a mock Transport"""
+        """How the request is sent by transmitting across a mock Transport"""
         # use a real transport, but intercept at the http/xml layer
         transport = InstrumentedXMLRPCTransport(self, expect_auth=True)
         service = LaunchpadService(transport)
@@ -188,7 +188,7 @@
                 '[e-mail]',
                 'product')
         rego.submit(service)
-        self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
+        self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
         self.assertEquals(len(transport.sent_params), 6)
         self.assertEquals(transport.sent_params,
                 ('http://test-server.com/bzr/branch',  # branch_url
@@ -200,12 +200,12 @@
         self.assertTrue(transport.got_request)
 
     def test_onto_transport_unauthenticated(self):
-        """Test how an unauthenticated request is transmitted across a mock Transport"""
+        """An unauthenticated request is transmitted across a mock Transport"""
         transport = InstrumentedXMLRPCTransport(self, expect_auth=False)
         service = LaunchpadService(transport)
         resolve = ResolveLaunchpadPathRequest('bzr')
         resolve.submit(service)
-        self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
+        self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
         self.assertEquals(len(transport.sent_params), 1)
         self.assertEquals(transport.sent_params, ('bzr', ))
         self.assertTrue(transport.got_request)
 
=== modified file 'bzrlib/reconcile.py'
--- bzrlib/reconcile.py	2009-07-31 22:48:55 +0000
+++ bzrlib/reconcile.py	2010-11-30 16:04:22 +0000
@@ -494,7 +494,7 @@
     #  - lock the names list
     #  - perform a customised pack() that regenerates data as needed
     #  - unlock the names list
-    # https://bugs.edge.launchpad.net/bzr/+bug/154173
+    # https://bugs.launchpad.net/bzr/+bug/154173
 
     def _reconcile_steps(self):
         """Perform the steps to reconcile this repository."""
 
=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2010-04-23 05:30:32 +0000
+++ bzrlib/remote.py	2010-11-30 16:04:22 +0000
@@ -824,7 +824,7 @@
     def _has_same_fallbacks(self, other_repo):
         """Returns true if the repositories have the same fallbacks."""
         # XXX: copied from Repository; it should be unified into a base class
-        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
+        # <https://bugs.launchpad.net/bzr/+bug/401622>
         my_fb = self._fallback_repositories
         other_fb = other_repo._fallback_repositories
         if len(my_fb) != len(other_fb):
 
=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2010-02-25 04:31:05 +0000
+++ bzrlib/repository.py	2010-11-30 16:04:22 +0000
@@ -1678,7 +1678,7 @@
                 "May not fetch while in a write group.")
         # fast path same-url fetch operations
         # TODO: lift out to somewhere common with RemoteRepository
-        # <https://bugs.edge.launchpad.net/bzr/+bug/401646>
+        # <https://bugs.launchpad.net/bzr/+bug/401646>
         if (self.has_same_location(source)
             and fetch_spec is None
             and self._has_same_fallbacks(source)):
 
=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-07-16 13:06:04 +0000
+++ bzrlib/tests/__init__.py	2010-11-30 16:04:22 +0000
@@ -755,7 +755,7 @@
     # XXX: Should probably unify more with CannedInputUIFactory or a
     # particular configuration of TextUIFactory, or otherwise have a clearer
     # idea of how they're supposed to be different.
-    # See https://bugs.edge.launchpad.net/bzr/+bug/408213
+    # See https://bugs.launchpad.net/bzr/+bug/408213
 
     def __init__(self, stdout=None, stderr=None, stdin=None):
         if stdin is not None:
 
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- bzrlib/tests/blackbox/test_branch.py	2010-02-24 08:03:07 +0000
+++ bzrlib/tests/blackbox/test_branch.py	2010-11-30 16:04:22 +0000
@@ -175,7 +175,7 @@
         if same_file:
             pass
         else:
-            # https://bugs.edge.launchpad.net/bzr/+bug/408193
+            # https://bugs.launchpad.net/bzr/+bug/408193
             self.assertContainsRe(err, "hardlinking working copy files is "
                 "not currently supported")
             raise KnownFailure("--hardlink doesn't work in formats "
 
=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
--- bzrlib/tests/blackbox/test_checkout.py	2009-08-03 04:19:03 +0000
+++ bzrlib/tests/blackbox/test_checkout.py	2010-11-30 16:04:22 +0000
@@ -164,7 +164,7 @@
         if same_file:
             pass
         else:
-            # https://bugs.edge.launchpad.net/bzr/+bug/408193
+            # https://bugs.launchpad.net/bzr/+bug/408193
             self.assertContainsRe(err, "hardlinking working copy files is "
                 "not currently supported")
             raise KnownFailure("--hardlink doesn't work in formats "
 
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2009-08-26 03:20:32 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2010-11-30 16:04:22 +0000
@@ -608,7 +608,7 @@
         self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
 
     def test_commit_readonly_checkout(self):
-        # https://bugs.edge.launchpad.net/bzr/+bug/129701
+        # https://bugs.launchpad.net/bzr/+bug/129701
         # "UnlockableTransport error trying to commit in checkout of readonly
         # branch"
         self.make_branch('master')
 
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- bzrlib/tests/blackbox/test_merge.py	2009-08-06 06:58:09 +0000
+++ bzrlib/tests/blackbox/test_merge.py	2010-11-30 16:04:22 +0000
@@ -375,7 +375,7 @@
     def test_directive_cherrypick(self):
         source = self.make_branch_and_tree('source')
         source.commit("nothing")
-        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
+        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
         # cherrypick from one branch into another unrelated branch with a
         # different root id will give shape conflicts.  as a workaround we
         # make sure they share the same root id.
 
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- bzrlib/tests/blackbox/test_reconfigure.py	2009-07-10 08:18:28 +0000
+++ bzrlib/tests/blackbox/test_reconfigure.py	2010-11-30 16:04:22 +0000
@@ -197,7 +197,7 @@
          * then make the second unstacked, so it has to fill in history from
            the original fallback lying underneath its original content
 
-        See discussion in <https://bugs.edge.launchpad.net/bzr/+bug/391411>
+        See discussion in <https://bugs.launchpad.net/bzr/+bug/391411>
         """
         # there are also per_branch tests that exercise remote operation etc
         tree_1 = self.make_branch_and_tree('b1', format='2a')
 
=== modified file 'bzrlib/tests/per_tree/test_inv.py'
--- bzrlib/tests/per_tree/test_inv.py	2010-02-12 03:33:36 +0000
+++ bzrlib/tests/per_tree/test_inv.py	2010-11-30 16:04:22 +0000
@@ -170,7 +170,7 @@
                          work_tree.get_canonical_inventory_path('Dir/None'))
 
     def test_canonical_tree_name_mismatch(self):
-        # see <https://bugs.edge.launchpad.net/bzr/+bug/368931>
+        # see <https://bugs.launchpad.net/bzr/+bug/368931>
         # some of the trees we want to use can only exist on a disk, not in
         # memory - therefore we can only test this if the filesystem is
         # case-sensitive.
 
=== modified file 'bzrlib/tests/per_workingtree/test_content_filters.py'
--- bzrlib/tests/per_workingtree/test_content_filters.py	2009-10-28 23:34:13 +0000
+++ bzrlib/tests/per_workingtree/test_content_filters.py	2010-11-30 16:04:22 +0000
@@ -227,7 +227,7 @@
 
     def test_path_content_summary(self):
         """path_content_summary should always talk about the canonical form."""
-        # see https://bugs.edge.launchpad.net/bzr/+bug/415508
+        # see https://bugs.launchpad.net/bzr/+bug/415508
         #
         # set up a tree where the canonical form has a string added to the
         # end
 
=== modified file 'bzrlib/tests/test_errors.py'
--- bzrlib/tests/test_errors.py	2010-09-06 06:13:52 +0000
+++ bzrlib/tests/test_errors.py	2010-11-30 16:04:22 +0000
@@ -678,7 +678,7 @@
             str(e), 'Unprintable exception ErrorWithBadFormat')
 
     def test_cannot_bind_address(self):
-        # see <https://bugs.edge.launchpad.net/bzr/+bug/286871>
+        # see <https://bugs.launchpad.net/bzr/+bug/286871>
         e = errors.CannotBindAddress('example.com', 22,
             socket.error(13, 'Permission denied'))
         self.assertContainsRe(str(e),
 
=== modified file 'bzrlib/tests/test_lockdir.py'
--- bzrlib/tests/test_lockdir.py	2010-09-06 06:13:52 +0000
+++ bzrlib/tests/test_lockdir.py	2010-11-30 16:04:22 +0000
@@ -728,7 +728,7 @@
     def test_no_lockdir_info(self):
         """We can cope with empty info files."""
         # This seems like a fairly common failure case - see
-        # <https://bugs.edge.launchpad.net/bzr/+bug/185103> and all its dupes.
+        # <https://bugs.launchpad.net/bzr/+bug/185103> and all its dupes.
         # Processes are often interrupted after opening the file
         # before the actual contents are committed.
         t = self.get_transport()
@@ -747,7 +747,7 @@
     def test_corrupt_lockdir_info(self):
         """We can cope with corrupt (and thus unparseable) info files."""
         # This seems like a fairly common failure case too - see
-        # <https://bugs.edge.launchpad.net/bzr/+bug/619872> for instance.
+        # <https://bugs.launchpad.net/bzr/+bug/619872> for instance.
         # In particular some systems tend to fill recently created files with
         # nul bytes after recovering from a system crash.
         t = self.get_transport()
 
=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py	2009-10-08 17:13:24 +0000
+++ bzrlib/tests/test_osutils.py	2010-11-30 16:04:22 +0000
@@ -1042,7 +1042,7 @@
         self.assertExpectedBlocks(expected_dirblocks[1:], result)
 
     def test_walkdirs_os_error(self):
-        # <https://bugs.edge.launchpad.net/bzr/+bug/338653>
+        # <https://bugs.launchpad.net/bzr/+bug/338653>
         # Pyrex readdir didn't raise useful messages if it had an error
         # reading the directory
         if sys.platform == 'win32':
 
=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2010-04-23 05:30:32 +0000
+++ bzrlib/tests/test_remote.py	2010-11-30 16:04:22 +0000
@@ -1534,7 +1534,7 @@
     def test_get_multi_line_branch_conf(self):
         # Make sure that multiple-line branch.conf files are supported
         #
-        # https://bugs.edge.launchpad.net/bzr/+bug/354075
+        # https://bugs.launchpad.net/bzr/+bug/354075
         client = FakeClient()
         client.add_expected_call(
             'Branch.get_stacked_on_url', ('memory:///',),
 
=== modified file 'bzrlib/tests/test_ui.py'
--- bzrlib/tests/test_ui.py	2010-02-25 05:46:32 +0000
+++ bzrlib/tests/test_ui.py	2010-11-30 16:04:22 +0000
@@ -366,7 +366,7 @@
 
     def test_test_ui_factory_progress(self):
         # there's no output; we just want to make sure this doesn't crash -
-        # see https://bugs.edge.launchpad.net/bzr/+bug/408201
+        # see https://bugs.launchpad.net/bzr/+bug/408201
         ui = TestUIFactory()
         pb = ui.nested_progress_bar()
         pb.update('hello')
@@ -375,7 +375,7 @@
 
 
 class CannedInputUIFactoryTests(TestCase):
-    
+
     def test_canned_input_get_input(self):
         uif = CannedInputUIFactory([True, 'mbp', 'password'])
         self.assertEqual(uif.get_boolean('Extra cheese?'), True)
 
=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2010-07-13 10:21:19 +0000
+++ bzrlib/workingtree_4.py	2010-11-30 16:04:22 +0000
@@ -1319,7 +1319,7 @@
     def _file_content_summary(self, path, stat_result):
         # This is to support the somewhat obsolete path_content_summary method
         # with content filtering: see
-        # <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
+        # <https://bugs.launchpad.net/bzr/+bug/415508>.
         #
         # If the dirstate cache is up to date and knows the hash and size,
         # return that.
@@ -1459,9 +1459,9 @@
                 # the source tree.
                 if wt.supports_content_filtering():
                     if hardlink:
-                        # see https://bugs.edge.launchpad.net/bzr/+bug/408193
-                        trace.warning("hardlinking working copy files is not currently "
-                            "supported in %r" % (wt,))
+                        # see https://bugs.launchpad.net/bzr/+bug/408193
+                        trace.warning('hardlinking working copy files is not'
+                                      ' currently supported in %r' % (wt,))
                     accelerator_tree = None
                     delta_from_tree = False
                 else:
 
=== modified file 'setup.py'
--- setup.py	2010-01-12 01:44:13 +0000
+++ setup.py	2010-11-30 16:04:22 +0000
@@ -283,8 +283,8 @@
         # The code it generates re-uses a "local" pointer and
         # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
         # which is NULL safe with PY_DECREF which is not.)
-        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
-        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
+        # <https://bugs.launchpad.net/bzr/+bug/449372>
+        # <https://bugs.launchpad.net/bzr/+bug/276868>
         print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
         print 'your version of pyrex "%s". Please upgrade your pyrex' % (
             pyrex_version,)