Rev 5244: (lifeless) Use the production Launchpad instance for XML-RPC requests (and in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri May 21 00:55:24 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5244 [merge]
revision-id: pqm at pqm.ubuntu.com-20100520235521-nog5pngmbiaxgaby
parent: pqm at pqm.ubuntu.com-20100520092748-oa7knubtqio8l2rc
parent: gzlist at googlemail.com-20100520182317-10t33p32m8qcq0m3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-05-21 00:55:21 +0100
message:
(lifeless) Use the production Launchpad instance for XML-RPC requests (and
also changes existing bug references to remove .edge from them. (Martin [gz])
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/crash.py crash.py-20090812083334-d6volool4lktdjcx-1
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/plugins/launchpad/lp_propose.py lp_submit.py-20100120065117-penrmqruf596pui6-1
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_tree/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/per_workingtree/test_content_filters.py test_content_filters-20080424071441-8navsrmrfdxpn90a-1
bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_import_tariff.py test_import_tariff.p-20100207155145-ff9infp7goncs7zh-1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2010-04-29 08:59:13 +0000
+++ b/bzrlib/bzrdir.py 2010-05-20 18:23:17 +0000
@@ -3245,7 +3245,7 @@
# XXX: It's a bit ugly that the network name is here, because we'd
# like to believe that format objects are stateless or at least
# immutable, However, we do at least avoid mutating the name after
- # it's returned. See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
+ # it's returned. See <https://bugs.launchpad.net/bzr/+bug/504102>
self._network_name = None
def __repr__(self):
=== modified file 'bzrlib/crash.py'
--- a/bzrlib/crash.py 2010-04-08 04:34:03 +0000
+++ b/bzrlib/crash.py 2010-05-20 18:23:17 +0000
@@ -173,7 +173,7 @@
pr['Package'] = 'bzr'
# tell apport to file directly against the bzr package using
- # <https://bugs.edge.launchpad.net/bzr/+bug/391015>
+ # <https://bugs.launchpad.net/bzr/+bug/391015>
#
# XXX: unfortunately apport may crash later if the crashdb definition
# file isn't present
=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py 2010-04-28 06:09:23 +0000
+++ b/bzrlib/lockdir.py 2010-05-20 18:23:17 +0000
@@ -243,7 +243,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.
@@ -540,7 +540,7 @@
deadline_str = time.strftime('%H:%M:%S',
time.localtime(deadline))
lock_url = self.transport.abspath(self.path)
- # See <https://bugs.edge.launchpad.net/bzr/+bug/250451>
+ # See <https://bugs.launchpad.net/bzr/+bug/250451>
# the URL here is sometimes not one that is useful to the
# user, perhaps being wrapped in a lp-%d or chroot decorator,
# especially if this error is issued from the server.
=== modified file 'bzrlib/plugins/launchpad/lp_propose.py'
--- a/bzrlib/plugins/launchpad/lp_propose.py 2010-04-26 13:51:08 +0000
+++ b/bzrlib/plugins/launchpad/lp_propose.py 2010-05-20 18:23:10 +0000
@@ -70,7 +70,7 @@
if staging:
lp_instance = 'staging'
else:
- lp_instance = 'edge'
+ lp_instance = 'production'
service = lp_registration.LaunchpadService(lp_instance=lp_instance)
self.launchpad = lp_api.login(service)
self.source_branch = lp_api.LaunchpadBranch.from_bzr(
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py 2010-05-20 18:23:10 +0000
@@ -98,11 +98,8 @@
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'
+ # Previously 'edge' was used to avoid a launchpad bug with redirection
+ DEFAULT_INSTANCE = 'production'
DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
transport = None
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- a/bzrlib/plugins/launchpad/test_lp_directory.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_directory.py 2010-05-20 18:23:10 +0000
@@ -91,7 +91,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'
--- a/bzrlib/plugins/launchpad/test_lp_open.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_open.py 2010-05-20 18:23:10 +0000
@@ -54,7 +54,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'))
@@ -65,7 +65,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'))
@@ -76,7 +76,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'))
@@ -85,7 +85,7 @@
# 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'))
@@ -96,6 +96,6 @@
'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
self.build_tree(['lp/a/'])
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('.', working_dir='lp/a'))
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
--- a/bzrlib/plugins/launchpad/test_lp_service.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_service.py 2010-05-20 18:23:10 +0000
@@ -97,7 +97,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 +152,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()
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2010-05-20 18:23:10 +0000
@@ -188,7 +188,7 @@
'author at launchpad.net',
'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
@@ -205,7 +205,7 @@
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'
--- a/bzrlib/reconcile.py 2010-04-30 11:35:43 +0000
+++ b/bzrlib/reconcile.py 2010-05-20 18:23:17 +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'
--- a/bzrlib/remote.py 2010-05-20 09:27:48 +0000
+++ b/bzrlib/remote.py 2010-05-20 18:23:17 +0000
@@ -899,7 +899,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'
--- a/bzrlib/repository.py 2010-05-14 13:32:48 +0000
+++ b/bzrlib/repository.py 2010-05-20 18:23:17 +0000
@@ -1723,7 +1723,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'
--- a/bzrlib/tests/__init__.py 2010-05-20 02:57:52 +0000
+++ b/bzrlib/tests/__init__.py 2010-05-20 18:23:17 +0000
@@ -749,7 +749,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_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py 2010-05-05 18:51:16 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py 2010-05-20 18:23:17 +0000
@@ -698,7 +698,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'
--- a/bzrlib/tests/blackbox/test_merge.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py 2010-05-20 18:23:17 +0000
@@ -393,7 +393,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'
--- a/bzrlib/tests/blackbox/test_reconfigure.py 2009-07-10 08:18:28 +0000
+++ b/bzrlib/tests/blackbox/test_reconfigure.py 2010-05-20 18:23:17 +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/blackbox/test_shelve.py'
--- a/bzrlib/tests/blackbox/test_shelve.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/blackbox/test_shelve.py 2010-05-20 18:23:17 +0000
@@ -68,7 +68,7 @@
self.assertIs(None, tree.get_shelf_manager().last_shelf())
def test_unshelve_keep(self):
- # https://bugs.edge.launchpad.net/bzr/+bug/492091
+ # https://bugs.launchpad.net/bzr/+bug/492091
tree = self.make_branch_and_tree('.')
# shelve apparently unhappy working with a tree with no root yet
tree.commit('make root')
=== modified file 'bzrlib/tests/blackbox/test_versioning.py'
--- a/bzrlib/tests/blackbox/test_versioning.py 2010-03-02 15:49:51 +0000
+++ b/bzrlib/tests/blackbox/test_versioning.py 2010-05-20 18:23:17 +0000
@@ -33,7 +33,7 @@
def test_mkdir_fails_cleanly(self):
"""'mkdir' fails cleanly when no working tree is available.
- https://bugs.edge.launchpad.net/bzr/+bug/138600
+ https://bugs.launchpad.net/bzr/+bug/138600
"""
# Since there is a safety working tree above us, we create a bare repo
# here locally.
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py 2010-04-21 04:02:42 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py 2010-05-20 18:23:17 +0000
@@ -1178,7 +1178,7 @@
# for remote formats, there must be no prior assumption about the
# network name to use - it's possible that this may somehow have got
# in through an unisolated test though - see
- # <https://bugs.edge.launchpad.net/bzr/+bug/504102>
+ # <https://bugs.launchpad.net/bzr/+bug/504102>
self.assertEquals(getattr(self.bzrdir_format,
'_network_name', None),
None)
=== modified file 'bzrlib/tests/per_tree/test_inv.py'
--- a/bzrlib/tests/per_tree/test_inv.py 2010-02-16 16:08:40 +0000
+++ b/bzrlib/tests/per_tree/test_inv.py 2010-05-20 18:23:17 +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'
--- a/bzrlib/tests/per_workingtree/test_content_filters.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/tests/per_workingtree/test_content_filters.py 2010-05-20 18:23:17 +0000
@@ -223,7 +223,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/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py 2010-04-21 09:41:26 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py 2010-05-20 18:23:17 +0000
@@ -615,7 +615,7 @@
rev1 = wt.commit('first master commit')
self.build_tree_contents([('wt/a', 'new content')])
rev2 = wt.commit('second master commit')
- # https://bugs.edge.launchpad.net/bzr/+bug/45719/comments/20
+ # https://bugs.launchpad.net/bzr/+bug/45719/comments/20
# when adding 'update -r' we should make sure all wt formats support
# it
conflicts = wt.update(revision=rev1)
=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py 2010-04-30 09:05:29 +0000
+++ b/bzrlib/tests/test_errors.py 2010-05-20 18:23:17 +0000
@@ -703,7 +703,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_import_tariff.py'
--- a/bzrlib/tests/test_import_tariff.py 2010-04-01 04:38:26 +0000
+++ b/bzrlib/tests/test_import_tariff.py 2010-05-20 18:23:17 +0000
@@ -102,4 +102,4 @@
# TODO: similar test for repository-only operations, checking we avoid
# loading wt-specific stuff
#
- # See https://bugs.edge.launchpad.net/bzr/+bug/553017
+ # See https://bugs.launchpad.net/bzr/+bug/553017
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py 2010-03-03 22:59:21 +0000
+++ b/bzrlib/tests/test_lockdir.py 2010-05-20 18:23:17 +0000
@@ -669,7 +669,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()
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py 2010-05-13 17:32:55 +0000
+++ b/bzrlib/tests/test_osutils.py 2010-05-20 18:23:17 +0000
@@ -1064,7 +1064,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_patches.py'
--- a/bzrlib/tests/test_patches.py 2010-02-25 06:17:27 +0000
+++ b/bzrlib/tests/test_patches.py 2010-05-20 18:23:17 +0000
@@ -55,8 +55,8 @@
datafile.close()
def test_parse_patches_leading_noise(self):
- # https://bugs.edge.launchpad.net/bzr/+bug/502076
- # https://code.edge.launchpad.net/~toshio/bzr/allow-dirty-patches/+merge/18854
+ # https://bugs.launchpad.net/bzr/+bug/502076
+ # https://code.launchpad.net/~toshio/bzr/allow-dirty-patches/+merge/18854
lines = ["diff -pruN commands.py",
"--- orig/commands.py",
"+++ mod/dommands.py"]
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2010-05-20 02:57:52 +0000
+++ b/bzrlib/tests/test_remote.py 2010-05-20 18:23:17 +0000
@@ -1618,7 +1618,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'
--- a/bzrlib/tests/test_ui.py 2010-04-26 13:51:08 +0000
+++ b/bzrlib/tests/test_ui.py 2010-05-20 18:23:17 +0000
@@ -385,7 +385,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 = tests.TestUIFactory()
pb = ui.nested_progress_bar()
pb.update('hello')
=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py 2010-04-22 16:04:16 +0000
+++ b/bzrlib/ui/text.py 2010-05-20 18:23:17 +0000
@@ -157,7 +157,7 @@
"""Construct and return a new ProgressView subclass for this UI.
"""
# with --quiet, never any progress view
- # <https://bugs.edge.launchpad.net/bzr/+bug/320035>. Otherwise if the
+ # <https://bugs.launchpad.net/bzr/+bug/320035>. Otherwise if the
# user specifically requests either text or no progress bars, always
# do that. otherwise, guess based on $TERM and tty presence.
if self.is_quiet():
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2010-05-11 08:36:16 +0000
+++ b/bzrlib/workingtree_4.py 2010-05-20 18:23:17 +0000
@@ -1329,7 +1329,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.
More information about the bazaar-commits
mailing list