Rev 6083: Fix report activity for https with pycurl in file:///home/vila/src/bzr/bugs/614713-https-pycurl-activity/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/614713-https-pycurl-activity/

------------------------------------------------------------
revno: 6083
revision-id: v.ladeuil+lp at free.fr-20110818091250-ywuhatsie1vtqyug
parent: pqm at pqm.ubuntu.com-20110818042306-neji85pljf86z885
fixes bug(s): https://launchpad.net/bugs/614713
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 614713-https-pycurl-activity
timestamp: Thu 2011-08-18 11:12:50 +0200
message:
  Fix report activity for https with pycurl
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py	2011-06-14 01:26:41 +0000
+++ b/bzrlib/transport/http/_pycurl.py	2011-08-18 09:12:50 +0000
@@ -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):
@@ -350,7 +348,9 @@
                         line = '%s: <masked>' % (header,)
                     lines.append(line)
                 trace.mutter('> ' + '\n> '.join(lines))
-        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):
             trace.mutter('* %s' % text.rstrip())
 
     def _set_curl_options(self, curl):

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-08-18 04:23:06 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-08-18 09:12:50 +0000
@@ -102,6 +102,9 @@
 * Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
   errors.  (Vincent Ladeuil, #822571)
 
+* Fix activity reporting for pycurl when using https with some
+  implementations of curl. (Vincent Ladeuil, #614713)
+
 * Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
 
 * TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so