Rev 4160: (mbp) merge back 1.13final to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Mar 18 02:14:35 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4160
revision-id: pqm at pqm.ubuntu.com-20090318021431-md1n8o3542wwsvai
parent: pqm at pqm.ubuntu.com-20090318013435-d4g73c7rzqidhct1
parent: mbp at sourcefrog.net-20090318012758-5ne2z0qg2jyf218u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-03-18 02:14:31 +0000
message:
(mbp) merge back 1.13final to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4158.2.1
revision-id: mbp at sourcefrog.net-20090318012758-5ne2z0qg2jyf218u
parent: pqm at pqm.ubuntu.com-20090317230937-pwr84cnqjoyzybex
parent: pqm at pqm.ubuntu.com-20090315060207-fshwkgik718fiym4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Wed 2009-03-18 12:27:58 +1100
message:
merge back 1.13final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4104.1.4
revision-id: pqm at pqm.ubuntu.com-20090315060207-fshwkgik718fiym4
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
parent: tanner at real-time.com-20090314111714-rlgorskbhzl7ny1k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Sun 2009-03-15 06:02:07 +0000
message:
(tanner) prepare 1.13
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4104.5.1
revision-id: tanner at real-time.com-20090314111714-rlgorskbhzl7ny1k
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
parent: robertc at robertcollins.net-20090313044609-jc84l8dco01uxvrx
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sat 2009-03-14 06:17:14 -0500
message:
Release 1.13
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4104.4.2
revision-id: robertc at robertcollins.net-20090313044609-jc84l8dco01uxvrx
parent: robertc at robertcollins.net-20090313043606-7ibht1zuuhww2sn2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 1.13-cherrypicks
timestamp: Fri 2009-03-13 15:46:09 +1100
message:
Fix test_source for 1.13 landing.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4104.4.1
revision-id: robertc at robertcollins.net-20090313043606-7ibht1zuuhww2sn2
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
parent: pqm at pqm.ubuntu.com-20090310064619-eq2pa07gvakf6zsk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 1.13-cherrypicks
timestamp: Fri 2009-03-13 15:36:06 +1100
message:
Cherrypick bugfixes from bzr.dev for 1.13:
4142: Fix performance regression (many small round-trips) when pushing to
a remote pack, and improve some tests.
4129: Fix bug when pushing stackable branch in unstackable repo to
default-stacking target.
4121: Remove __del__ from LockableFiles.
4117: Handle inconsistent inventories in fetch more robustly.
4105: Report network activity for bzr+ssh:// and bzr:// connections.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
=== modified file 'NEWS'
--- a/NEWS 2009-03-18 00:48:27 +0000
+++ b/NEWS 2009-03-18 02:14:31 +0000
@@ -5,7 +5,6 @@
.. contents::
-
IN DEVELOPMENT
--------------
@@ -129,12 +128,22 @@
(Andrew Bennetts, Robert Collins)
-bzr 1.13rc1 "paraskavedekatriaphobia" 2009-03-10
-------------------------------------------------
+bzr 1.13 "paraskavedekatriaphobia" 2009-03-14
+---------------------------------------------
+
This release includes bug fixes and a few performance and feature improvements.
-GNU Changelog output can now be produced by ``bzr log --format gnu-changelog``.
-Debug flags can now be set in ``~/.bazaar/bazaar.conf``. Lightweight Checkouts
-and Stacked Branches should both be much faster over remote connections.
+GNU Changelog output can now be produced by ``bzr log --log-format gnu-changelog``.
+Debug flags can now be set in ``~/.bazaar/bazaar.conf``. Lightweight checkouts
+and stacked branches should both be much faster over remote connections.
+
+ CHANGES FROM bzr 1.13rc1 2009-03-10:
+
+ * Fix "is not a stackable format" error when pushing a
+ stackable-format branch with an unstackable-format repository to a
+ destination with a default stacking policy. (Andrew Bennetts)
+
+ * Progress bars now show the rate of network activity for
+ ``bzr+ssh://`` and ``bzr://`` connections. (Andrew Bennetts)
COMPATIBILITY BREAKS:
@@ -157,7 +166,7 @@
in chapter 7 of the User Guide and ``bzr help view`` for details.
(Ian Clatworthy)
- * GNU Changelog output can now be produced by ``bzr log --format
+ * GNU Changelog output can now be produced by ``bzr log --log-format
gnu-changelog``. (Andrea Bolognani, Martin Pool)
* The ``-Dmemory`` flag now gives memory information on Windows.
=== modified file 'bzrlib/lockable_files.py'
--- a/bzrlib/lockable_files.py 2009-03-16 05:05:52 +0000
+++ b/bzrlib/lockable_files.py 2009-03-18 01:27:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008 Canonical Ltd
+# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2009-03-17 06:18:16 +0000
+++ b/bzrlib/remote.py 2009-03-18 01:27:58 +0000
@@ -428,7 +428,7 @@
if self._supports_external_lookups is None:
self._ensure_real()
self._supports_external_lookups = \
- self._custom_format.supports_external_lookups
+ self._custom_format.supports_external_lookups
return self._supports_external_lookups
@property
=== modified file 'bzrlib/tests/interrepository_implementations/test_fetch.py'
--- a/bzrlib/tests/interrepository_implementations/test_fetch.py 2009-03-12 05:44:43 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_fetch.py 2009-03-18 01:27:58 +0000
@@ -76,7 +76,7 @@
def test_fetch_inconsistent_last_changed_entries(self):
"""If an inventory has odd data we should still get what it references.
-
+
This test tests that we do fetch a file text created in a revision not
being fetched, but referenced from the revision we are fetching when the
adjacent revisions to the one being fetched do not reference that text.
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-03-17 06:18:16 +0000
+++ b/bzrlib/tests/test_remote.py 2009-03-18 01:27:58 +0000
@@ -68,9 +68,9 @@
to_adapt, result = split_suite_by_condition(
standard_tests, condition_isinstance(BasicRemoteObjectTests))
smart_server_version_scenarios = [
- ('HPSS-v2',
+ ('HPSS-v2',
{'transport_server': server.SmartTCPServer_for_testing_v2_only}),
- ('HPSS-v3',
+ ('HPSS-v3',
{'transport_server': server.SmartTCPServer_for_testing})]
return multiply_tests(to_adapt, smart_server_version_scenarios, result)
More information about the bazaar-commits
mailing list