Rev 4882: Merge 2.0 into 2.1 (including fix for #614713) in http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4882 [merge]
revision-id: v.ladeuil+lp at free.fr-20110819124928-y4hy2tazio0i6d3c
parent: pqm at pqm.ubuntu.com-20110818054019-p1sz3hepgi5ceg8a
parent: pqm at pqm.ubuntu.com-20110819123645-9qb5q134bohp1p3s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.1.4-dev
timestamp: Fri 2011-08-19 14:49:28 +0200
message:
  Merge 2.0 into 2.1 (including fix for #614713)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2011-08-15 10:42:59 +0000
+++ b/NEWS	2011-08-19 12:49:28 +0000
@@ -225,6 +225,9 @@
 * Avoid spurious ValueErrors when autopacking a subset of the repository,
   and seeing a revision without its related inventory
   (John Arbash Meinel, #437003)
+ 
+* Fix activity reporting for pycurl when using https with some
+  implementations of curl. (Vincent Ladeuil, #614713)
 
 Improvements
 ************

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py	2009-08-19 16:33:39 +0000
+++ b/bzrlib/transport/http/_pycurl.py	2011-08-19 11:14:17 +0000
@@ -307,19 +307,19 @@
                 url, 'Unable to handle http code %d%s' % (code,msg))
 
     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):
                 mutter('< %s' % text)
-        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):
                 mutter('> %s' % text)
-        elif kind == pycurl.INFOTYPE_TEXT and 'http' in debug.debug_flags:
+        elif (kind in (pycurl.INFOTYPE_TEXT, pycurl.INFOTYPE_SSL_DATA_IN,
+                       pycurl.INFOTYPE_SSL_DATA_OUT)
+              and 'http' in debug.debug_flags):
             mutter('* %s' % text)
 
     def _set_curl_options(self, curl):