Rev 5114: (vila) Merge 2.1 into 2.2 including fix for bug #583667 (Vincent in file:///home/pqm/archives/thelove/bzr/2.2/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Dec 2 14:12:33 GMT 2010
At file:///home/pqm/archives/thelove/bzr/2.2/
------------------------------------------------------------
revno: 5114 [merge]
revision-id: pqm at pqm.ubuntu.com-20101202141229-wymlgvcy2q6l9zo8
parent: pqm at pqm.ubuntu.com-20101201045914-3m30v3675n478po8
parent: v.ladeuil+lp at free.fr-20101202125344-wq86bjpx195vhhb8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Thu 2010-12-02 14:12:29 +0000
message:
(vila) Merge 2.1 into 2.2 including fix for bug #583667 (Vincent
Ladeuil)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/plugins/launchpad/lp_api.py lp_api.py-20090704082908-79il6zl4gugwl3wz-1
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_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
doc/developers/content-filtering.txt contentfiltering.txt-20090825034801-16mynkm76jpmi4tp-1
doc/developers/contribution-quickstart.txt contributionquicksta-20091118014608-u0t1h53l2t81rir3-1
doc/developers/ec2.txt ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/whats-new/whats-new-in-2.1.txt whatsnewin2.1.txt-20100219022615-9hp8102qyo9brhla-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/check-newsbugs.py checknewsbugs.py-20090128204947-lsdwd8nlswm1yrwv-1
=== modified file 'NEWS'
--- a/NEWS 2010-12-01 02:52:16 +0000
+++ b/NEWS 2010-12-02 09:29:41 +0000
@@ -13,6 +13,12 @@
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. (Vincent Ladeuil, #583667)
+
New Features
************
@@ -224,6 +230,12 @@
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. (Vincent Ladeuil, #583667)
+
New Features
************
@@ -339,6 +351,42 @@
(Martin Pool, John Arbash Meinel)
+bzr 2.0.7
+#########
+
+:2.0.7: NOT RELEASED YET
+
+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. (Vincent Ladeuil, #583667)
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
bzr 2.0.6
#########
@@ -3354,7 +3402,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/_patiencediff_c.c'
--- a/bzrlib/_patiencediff_c.c 2010-03-11 04:33:41 +0000
+++ b/bzrlib/_patiencediff_c.c 2010-12-02 09:46:15 +0000
@@ -47,8 +47,8 @@
/* malloc returns NULL on some platforms if you try to allocate nothing,
- * causing <https://bugs.edge.launchpad.net/bzr/+bug/511267> and
- * <https://bugs.edge.launchpad.net/bzr/+bug/331095>. On glibc it passes, but
+ * causing <https://bugs.launchpad.net/bzr/+bug/511267> and
+ * <https://bugs.launchpad.net/bzr/+bug/331095>. On glibc it passes, but
* let's make it fail to aid testing. */
#define guarded_malloc(x) ( (x) ? malloc(x) : NULL )
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py 2010-03-05 08:55:12 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py 2010-11-26 18:13:30 +0000
@@ -43,7 +43,6 @@
raise errors.DependencyNotPresent('launchpadlib', e)
from launchpadlib.launchpad import (
- EDGE_SERVICE_ROOT,
STAGING_SERVICE_ROOT,
Launchpad,
)
@@ -76,7 +75,6 @@
LAUNCHPAD_API_URLS = {
'production': 'https://api.launchpad.net/beta/',
- 'edge': EDGE_SERVICE_ROOT,
'staging': STAGING_SERVICE_ROOT,
'dev': 'https://api.launchpad.dev/beta/',
}
@@ -85,8 +83,8 @@
def _get_api_url(service):
"""Return the root URL of the Launchpad API.
- e.g. For the 'edge' Launchpad service, this function returns
- launchpadlib.launchpad.EDGE_SERVICE_ROOT.
+ e.g. For the 'staging' Launchpad service, this function returns
+ launchpadlib.launchpad.STAGING_SERVICE_ROOT.
:param service: A `LaunchpadService` object.
:return: A URL as a string.
=== modified file 'bzrlib/plugins/launchpad/lp_propose.py'
--- a/bzrlib/plugins/launchpad/lp_propose.py 2010-05-21 11:01:38 +0000
+++ b/bzrlib/plugins/launchpad/lp_propose.py 2010-11-26 19:32:56 +0000
@@ -74,7 +74,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-05-20 18:23:10 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py 2010-12-02 09:23:10 +0000
@@ -86,7 +86,6 @@
LAUNCHPAD_DOMAINS = {
'production': 'launchpad.net',
- 'edge': 'edge.launchpad.net',
'staging': 'staging.launchpad.net',
'demo': 'demo.launchpad.net',
'dev': 'launchpad.dev',
@@ -98,7 +97,8 @@
for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
- # Previously 'edge' was used to avoid a launchpad bug with redirection
+ # 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]
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
--- a/bzrlib/plugins/launchpad/test_lp_service.py 2010-05-20 18:23:10 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_service.py 2010-11-26 17:33:55 +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/',
@@ -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'
--- a/bzrlib/plugins/launchpad/test_register.py 2010-05-20 18:23:10 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2010-11-26 17:33:55 +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)
@@ -200,7 +200,7 @@
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')
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py 2010-09-27 07:24:54 +0000
+++ b/bzrlib/tests/test_lockdir.py 2010-12-02 09:23:10 +0000
@@ -741,7 +741,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 'doc/developers/bug-handling.txt'
--- a/doc/developers/bug-handling.txt 2010-05-31 19:33:05 +0000
+++ b/doc/developers/bug-handling.txt 2010-12-02 09:46:15 +0000
@@ -19,14 +19,14 @@
Links
*****
-* `bzr bugs home page <https://bugs.edge.launchpad.net/bzr>`_.
-
-* `Critical bugs <https://bugs.edge.launchpad.net/bzr/+bugs?search=Search&field.importance=Critical&field.status=New&field.status=Incomplete&field.status=Confirmed&field.status=Triaged&field.status=In+Progress&field.status=Fix+Committed>`_.
-
-* `Open bugs by importance <https://bugs.edge.launchpad.net/bzr/+bugs>`_.
+* `bzr bugs home page <https://bugs.launchpad.net/bzr>`_.
+
+* `Critical bugs <https://bugs.launchpad.net/bzr/+bugs?search=Search&field.importance=Critical&field.status=New&field.status=Incomplete&field.status=Confirmed&field.status=Triaged&field.status=In+Progress&field.status=Fix+Committed>`_.
+
+* `Open bugs by importance <https://bugs.launchpad.net/bzr/+bugs>`_.
* `Open bugs most recently changed first
- <https://bugs.edge.launchpad.net/bzr/+bugs?field.searchtext=&orderby=-date_last_updated&search=Search&field.status%3Alist=NEW&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.assignee=&field.bug_reporter=&field.omit_dupes=on&field.has_patch=&field.has_no_package=>`_.
+ <https://bugs.launchpad.net/bzr/+bugs?field.searchtext=&orderby=-date_last_updated&search=Search&field.status%3Alist=NEW&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.assignee=&field.bug_reporter=&field.omit_dupes=on&field.has_patch=&field.has_no_package=>`_.
* `Most commonly duplicated bugs <http://tinyurl.com/bzr-bugs-by-dupes>`_.
@@ -228,7 +228,7 @@
***************
It's possible to target a bug to a milestone, eg
-<https://bugs.edge.launchpad.net/bzr/+milestone/1.16>. We use this to help the
+<https://bugs.launchpad.net/bzr/+milestone/1.16>. We use this to help the
release manager know what **must** be merged to make the release.
Therefore, we don't target bugs that we'd like to have fixed or that could
@@ -313,16 +313,18 @@
virtual filesystem for http, sftp, etc
trivial
- should be very easy to fix (10-20 minutes) and easily landed: typically just spelling errors and the like
+ should be very easy to fix (10-20 minutes) and easily landed: typically
+ just spelling errors and the like
ui
bugs relating to the bzr user interface, e.g. confusing error messages.
win32
- bugs that mainly affects Windows. Also there is cygwin and win98 tags for marking specific bugs.
+ bugs that mainly affects Windows. Also there is cygwin and win98 tags for
+ marking specific bugs.
You can see the full list of tags in use at
-<https://bugs.edge.launchpad.net/bzr/+bugs>. As of September 2008 the
-list is on the right.
+<https://bugs.launchpad.net/bzr/+bugs>. As of September 2008 the
+list is on the right.
.. vim: ft=rst
=== modified file 'doc/developers/content-filtering.txt'
--- a/doc/developers/content-filtering.txt 2010-08-13 19:08:57 +0000
+++ b/doc/developers/content-filtering.txt 2010-12-02 09:46:15 +0000
@@ -59,7 +59,7 @@
which that cache is valid. This implies that the stored size will
in general be different to the size in the packed stat. (However, it
may not always do this correctly - see
-<https://bugs.edge.launchpad.net/bzr/+bug/418439>.)
+<https://bugs.launchpad.net/bzr/+bug/418439>.)
The dirstate is given a SHA1Provider instance by its tree. This class
can calculate the (canonical) hash and size given a filename. This
=== modified file 'doc/developers/contribution-quickstart.txt'
--- a/doc/developers/contribution-quickstart.txt 2010-06-11 07:44:09 +0000
+++ b/doc/developers/contribution-quickstart.txt 2010-12-02 09:57:12 +0000
@@ -26,7 +26,7 @@
you should set it to "In Progress" and if you wish assign it to yourself.
You might like to start with a bug tagged `easy
-<https://bugs.edge.launchpad.net/bzr/+bugs?field.tag=easy>`_.
+<https://bugs.launchpad.net/bzr/+bugs?field.tag=easy>`_.
Making a branch
---------------
=== modified file 'doc/developers/ec2.txt'
--- a/doc/developers/ec2.txt 2009-12-02 20:34:07 +0000
+++ b/doc/developers/ec2.txt 2010-12-02 09:42:45 +0000
@@ -125,9 +125,9 @@
* Install the rdesktop client, to actually access the machine.
* Possibly read some of the `EC2 documentation`_ for background.
-
-.. _`bug 330930`: https://bugs.edge.launchpad.net/ubuntu/+bug/330930
-.. _`Amazon EC2 API tools`:
+
+.. _`bug 330930`: https://bugs.launchpad.net/ubuntu/+bug/330930
+.. _`Amazon EC2 API tools`:
http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
.. _`EC2 documentation`: http://aws.amazon.com/
.. _`ami-bdfe19d4`:
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2010-08-13 19:08:57 +0000
+++ b/doc/developers/releasing.txt 2010-12-02 09:57:12 +0000
@@ -42,11 +42,11 @@
the release branch.
#. If you made a new series, add milestones at
- <https://edge.launchpad.net/bzr/x.y/+addmilestone> to that series for
+ <https://launchpad.net/bzr/x.y/+addmilestone> to that series for
the beta release, release candidate and the final release, and their
expected dates.
-#. Create a new milestone <https://edge.launchpad.net/bzr/x.y/+addmilestone>
+#. Create a new milestone <https://launchpad.net/bzr/x.y/+addmilestone>
and add information about this release. We will not use it yet, but it
will be available for targeting or nominating bugs.
@@ -137,8 +137,8 @@
./tools/check-newsbugs.py NEWS
- (But note there will be many false positives, and this script may be
- flaky <https://bugs.edge.launchpad.net/bzr/+bug/354985>. Don't let
+ (But note there can be some false positives, and this script may be
+ flaky <https://bugs.launchpad.net/bzr/+bug/354985>. Don't let
this slow you down too much.)
#. Commit these changes to the release branch, using a command like::
@@ -236,7 +236,7 @@
this changes what the download widget on the Launchpad bzr home
page shows, so don't stop the release process yet, or platform binary
installers won't be made and the download list will stay very small!
- <https://bugs.edge.launchpad.net/launchpad/+bug/586445>
+ <https://bugs.launchpad.net/launchpad/+bug/586445>
Announcing the source freeze
=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- a/doc/en/whats-new/whats-new-in-2.1.txt 2010-02-19 05:08:31 +0000
+++ b/doc/en/whats-new/whats-new-in-2.1.txt 2010-12-02 09:21:11 +0000
@@ -62,6 +62,16 @@
or just say ``today`` (instead of saying ``date:today``). Prefixes
are now only required if the revision spec could be ambiguous.
+Launchpad compatibility
+-----------------------
+
+Launchpad has `announced
+<http://blog.launchpad.net/general/edge-is-deprecated>`_ that the
+``edge.launchpad.net`` instance is deprecated and may be shut down in the
+future . Bazaar has therefore been updated in this release to talk to the main
+(``launchpad.net``) servers, rather than the ``edge`` ones (the same code is
+running on both servers during the interim).
+
New ignore patterns
-------------------
=== modified file 'setup.py'
--- a/setup.py 2010-10-18 07:40:38 +0000
+++ b/setup.py 2010-12-02 09:23:10 +0000
@@ -291,11 +291,11 @@
# 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,))
+ print('your version of pyrex "%s". Please upgrade your pyrex'
+ % (pyrex_version,))
print('install. For now, the non-compiled (python) version will')
print('be used instead.')
else:
=== modified file 'tools/check-newsbugs.py'
--- a/tools/check-newsbugs.py 2010-06-01 16:46:47 +0000
+++ b/tools/check-newsbugs.py 2010-11-26 19:32:56 +0000
@@ -61,7 +61,8 @@
f.close()
-lp = Launchpad.login_anonymously('bzr-check-newsbugs', 'edge', version='1.0')
+lp = Launchpad.login_anonymously('bzr-check-newsbugs', 'production',
+ version='1.0')
bugnos = read_news_bugnos(args[1])
for bugno, section in bugnos:
More information about the bazaar-commits
mailing list