Rev 6036: Merge 2.3 into 2.4 (including fix for #614713) in http://bazaar.launchpad.net/~vila/bzr/2.4-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.4-integration/

------------------------------------------------------------
revno: 6036 [merge]
revision-id: v.ladeuil+lp at free.fr-20110820182934-po77dwr25hahee8c
parent: pqm at pqm.ubuntu.com-20110818174456-bfxvop3tb9f1b5dn
parent: pqm at pqm.ubuntu.com-20110820123150-epmi6cndc5lcv8ab
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.4.0-dev
timestamp: Sat 2011-08-20 20:29:34 +0200
message:
  Merge 2.3 into 2.4 (including fix for #614713)
modified:
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py	2011-08-05 16:42:53 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py	2011-08-20 18:29:34 +0000
@@ -103,7 +103,7 @@
                 'Launchpad project short name to associate with the branch.',
                 unicode),
          Option('product',
-                'Launchpad product short name to associate with the branch.', 
+                'Launchpad product short name to associate with the branch.',
                 unicode,
                 hidden=True),
          Option('branch-name',

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py	2011-06-07 12:25:45 +0000
+++ b/bzrlib/transport/http/_pycurl.py	2011-08-20 18:29:34 +0000
@@ -34,12 +34,12 @@
 from cStringIO import StringIO
 import httplib
 
+import bzrlib
 from bzrlib import (
     debug,
     errors,
     trace,
     )
-import bzrlib
 from bzrlib.transport.http import (
     ca_bundle,
     HttpTransportBase,
@@ -327,14 +327,12 @@
                 % (code, msg, plaintext_body))
 
     def _debug_cb(self, kind, text):
-        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN,
-                    pycurl.INFOTYPE_SSL_DATA_IN):
+        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN):
             self._report_activity(len(text), 'read')
             if (kind == pycurl.INFOTYPE_HEADER_IN
                 and 'http' in debug.debug_flags):
                 trace.mutter('< %s' % (text.rstrip(),))
-        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT,
-                      pycurl.INFOTYPE_SSL_DATA_OUT):
+        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT):
             self._report_activity(len(text), 'write')
             if (kind == pycurl.INFOTYPE_HEADER_OUT
                 and 'http' in debug.debug_flags):
@@ -352,6 +350,10 @@
                 trace.mutter('> ' + '\n> '.join(lines))
         elif kind == pycurl.INFOTYPE_TEXT and 'http' in debug.debug_flags:
             trace.mutter('* %s' % text.rstrip())
+        elif (kind in (pycurl.INFOTYPE_TEXT, pycurl.INFOTYPE_SSL_DATA_IN,
+                       pycurl.INFOTYPE_SSL_DATA_OUT)
+              and 'http' in debug.debug_flags):
+            trace.mutter('* %s' % text)
 
     def _set_curl_options(self, curl):
         """Set options for all requests"""

=== modified file 'doc/en/release-notes/bzr-2.0.txt'
--- a/doc/en/release-notes/bzr-2.0.txt	2011-03-09 08:30:16 +0000
+++ b/doc/en/release-notes/bzr-2.0.txt	2011-08-20 09:28:27 +0000
@@ -32,6 +32,9 @@
 * Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
   path on windows from symlink support addition. (Martin [gz], #686611)
 
+* Fix activity reporting for pycurl when using https with some
+  implementations of curl. (Vincent Ladeuil, #614713)
+
 Improvements
 ************
 

=== modified file 'doc/en/release-notes/bzr-2.1.txt'
--- a/doc/en/release-notes/bzr-2.1.txt	2011-05-17 15:14:38 +0000
+++ b/doc/en/release-notes/bzr-2.1.txt	2011-08-20 09:28:27 +0000
@@ -19,6 +19,30 @@
 Bug Fixes
 *********
 
+* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
+  checks to see if the most recent published source package version for
+  that project is present in the branch tags. This should help developers
+  trust whether the packaging branch is up-to-date and can be used for new
+  changes. The level of verbosity is controlled by the config item
+  ``launchpad.packaging_verbosity``. It can be set to one of
+
+  off
+    disable all checks
+
+
+  minimal
+    only display if the branch is out-of-date
+
+  short
+    also display single-line up-to-date and missing,
+
+
+  all
+    (default) display multi-line content for all states
+
+
+  (John Arbash Meinel, #609187, #812928)
+
 Improvements
 ************