Rev 5616: (vila) Merge 2.2 into 2.3 for lp:707075. Also sync up in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5616 [merge]
revision-id: pqm at pqm.ubuntu.com-20110202161426-udx0nsgnlu2rja5h
parent: pqm at pqm.ubuntu.com-20110201073843-0chv714dkh1m1pv0
parent: maxb at f2s.com-20110202143327-mnplbp52i25y2mo2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Wed 2011-02-02 16:14:26 +0000
message:
  (vila) Merge 2.2 into 2.3 for lp:707075. Also sync up
   doc/en/release-notes/bzr-2.2.txt with bzr 2.2's NEWS. (Max Bowsher)
modified:
  bzrlib/plugins/launchpad/lp_api.py lp_api.py-20090704082908-79il6zl4gugwl3wz-1
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2010-12-02 10:41:05 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2011-02-02 14:33:27 +0000
@@ -47,10 +47,6 @@
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
-try:
-    from launchpadlib.uris import LPNET_SERVICE_ROOT
-except ImportError:
-    LPNET_SERVICE_ROOT = 'https://api.launchpad.net/beta/'
 
 
 # Declare the minimum version of launchpadlib that we need in order to work.
@@ -78,10 +74,25 @@
             installed_version, installed_version)
 
 
+# The older versions of launchpadlib only provided service root constants for
+# edge and staging, whilst newer versions drop edge. Therefore service root
+# URIs for which we do not always have constants are derived from the staging
+# one, which does always exist.
+#
+# It is necessary to derive, rather than use hardcoded URIs because
+# launchpadlib <= 1.5.4 requires service root URIs that end in a path of
+# /beta/, whilst launchpadlib >= 1.5.5 requires service root URIs with no path
+# info.
+#
+# Once we have a hard dependency on launchpadlib >= 1.5.4 we can replace all of
+# bzr's local knowledge of individual Launchpad instances with use of the
+# launchpadlib.uris module.
 LAUNCHPAD_API_URLS = {
-    'production': LPNET_SERVICE_ROOT,
+    'production': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
+        'api.launchpad.net'),
     'staging': STAGING_SERVICE_ROOT,
-    'dev': 'https://api.launchpad.dev/beta/',
+    'dev': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
+        'api.launchpad.dev'),
     }
 
 

=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt	2010-12-24 17:47:53 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2011-02-02 14:33:27 +0000
@@ -5,10 +5,49 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.2.4
+#########
+
+:2.2.4: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Fix communications with the Launchpad web service when using
+  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
+  with Launchpad's production instance, which only became a problem when
+  the default instance was switched from edge to production in bzr 2.2.3.
+  (Max Bowsher, #707075)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.2.3
 #########
 
-:2.2.3: NOT RELEASED YET
+:2.2.3: 2011-01-20
+
+This is a bugfix release. Upgrading is recommended for all users
+on earlier 2.2 releases.
 
 Compatibility Breaks
 ********************
@@ -19,19 +58,23 @@
   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
 *********
 
 * Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
   path on windows from symlink support addition. (Martin [gz], #686611)
 
+* Correctly resolve content (and path) conflicts for files in subdirs.
+  (Vincent Ladeuil, #660935)
+
 * Don't probe for a repository from within ``NotBranchError.__repr__``,
   because this can cause knock-on errors at awkward times.
   (Andrew Bennetts, #687653)
 
+* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
+  concurrent repository pack operation.  This was particularly affecting
+  ``bzr-svn`` users.  (Andrew Bennetts, #701940)
+
 * ``https`` access works again with recent versions of python2.7.
   (Vincent Ladeuil, #693880)
 
@@ -39,20 +82,6 @@
   symlinks.  Instead, it returns False, like other Trees and methods.
   (Aaron Bentley, #681885)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
 
 bzr 2.2.2
 #########
@@ -62,9 +91,6 @@
 This is a bugfix release. None of these bugfixes are critical, but upgrading
 is recommended for all users on earlier 2.2 releases.
 
-New Features
-************
-
 Bug Fixes
 *********