Rev 6090: (vila) Merge 2.4 into trunk (including fix for #614713, #735417, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Aug 21 11:35:38 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6090 [merge]
revision-id: pqm at pqm.ubuntu.com-20110821113535-5pi9vz6tx6wdf62m
parent: pqm at pqm.ubuntu.com-20110820224234-l0c0cmesdnfp2srq
parent: v.ladeuil+lp at free.fr-20110821092401-7fytha1l2060bboe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-08-21 11:35:35 +0000
message:
(vila) Merge 2.4 into trunk (including fix for #614713, #735417,
#609187 and #812928) (Vincent Ladeuil)
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
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
doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py 2011-08-09 17:01:47 +0000
+++ b/bzrlib/help_topics/__init__.py 2011-08-21 09:24:01 +0000
@@ -613,8 +613,7 @@
BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
BZR_COLUMNS Override implicit terminal width.
BZR_CONCURRENCY Number of processes that can be run concurrently (selftest)
-BZR_PROGRESS_BAR Override the progress display. Values are 'none', 'dots',
- or 'tty'.
+BZR_PROGRESS_BAR Override the progress display. Values are 'none' or 'text'.
BZR_PDB Control whether to launch a debugger on error.
BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a
breakin debugger.
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py 2011-08-12 09:49:24 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py 2011-08-21 09:24:01 +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/repository.py'
--- a/bzrlib/repository.py 2011-07-23 11:16:56 +0000
+++ b/bzrlib/repository.py 2011-08-21 09:24:01 +0000
@@ -1889,3 +1889,7 @@
for list_part in self.list_parts:
full_list.extend(list_part)
return iter(full_list)
+
+ def __repr__(self):
+ return "%s.%s(%s)" % (self.__module__, self.__class__.__name__,
+ self.list_parts)
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2011-08-19 22:34:02 +0000
+++ b/bzrlib/tests/test_repository.py 2011-08-21 09:24:01 +0000
@@ -1660,3 +1660,11 @@
def test_IDS_format_same_no(self):
# When the formats are the same, pack is not called.
self.run_fetch('2a', '2a', False)
+
+
+class Test_LazyListJoin(tests.TestCase):
+
+ def test__repr__(self):
+ lazy = repository._LazyListJoin(['a'], ['b'])
+ self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
+ repr(lazy))
=== 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-21 09:24:01 +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
************
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt 2011-08-16 14:20:13 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2011-08-21 09:24:01 +0000
@@ -37,6 +37,9 @@
.. Improved or updated documentation.
+* Corrected documentation for BZR_PROGRESS_BAR.
+ (Dennis Benzinger, #735417)
+
API Changes
***********
More information about the bazaar-commits
mailing list