Rev 5652: Merge wip for bug #715000 into trunk in file:///home/vila/src/bzr/reviews/2.4-715000-stacking/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Feb 8 11:12:12 UTC 2011
At file:///home/vila/src/bzr/reviews/2.4-715000-stacking/
------------------------------------------------------------
revno: 5652 [merge]
revision-id: v.ladeuil+lp at free.fr-20110208111211-l2fh362zybjolagh
parent: pqm at pqm.ubuntu.com-20110207183342-sid8o7k8d1c5ph7c
parent: v.ladeuil+lp at free.fr-20110208110603-3phb1mz27iljnss2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.4-715000-stacking
timestamp: Tue 2011-02-08 12:12:11 +0100
message:
Merge wip for bug #715000 into trunk
added:
bzrlib/tests/per_repository_reference/test_graph.py test_graph.py-20110208074011-b92ci87urjayd2q7-1
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py 2010-10-29 17:07:42 +0000
+++ b/bzrlib/commands.py 2011-02-04 22:25:59 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 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
@@ -691,7 +691,10 @@
return self.run(**all_cmd_args)
finally:
# reset it, so that other commands run in the same process won't
- # inherit state
+ # inherit state. Before we reset it, log any activity, so that it
+ # gets properly tracked.
+ ui.ui_factory.log_transport_activity(
+ display=('bytes' in debug.debug_flags))
trace.set_verbosity_level(0)
def _setup_run(self):
@@ -1202,8 +1205,6 @@
argv = _specified_or_unicode_argv(argv)
_register_builtin_commands()
ret = run_bzr_catch_errors(argv)
- bzrlib.ui.ui_factory.log_transport_activity(
- display=('bytes' in debug.debug_flags))
trace.mutter("return code %d", ret)
return ret
=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py 2010-09-26 20:45:28 +0000
+++ b/bzrlib/groupcompress.py 2011-02-08 11:06:03 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2008-2011 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
@@ -1312,7 +1312,7 @@
# KnitVersionedFiles.get_known_graph_ancestry, but they don't share
# ancestry.
parent_map, missing_keys = self._index.find_ancestry(keys)
- for fallback in self._fallback_vfs:
+ for fallback in self._transitive_fallbacks():
if not missing_keys:
break
(f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py 2011-01-11 20:42:36 +0000
+++ b/bzrlib/knit.py 2011-02-08 11:06:03 +0000
@@ -1196,7 +1196,7 @@
def get_known_graph_ancestry(self, keys):
"""Get a KnownGraph instance with the ancestry of keys."""
parent_map, missing_keys = self._index.find_ancestry(keys)
- for fallback in self._fallback_vfs:
+ for fallback in self._transitive_fallbacks():
if not missing_keys:
break
(f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
=== modified file 'bzrlib/tests/blackbox/test_debug.py'
--- a/bzrlib/tests/blackbox/test_debug.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/blackbox/test_debug.py 2011-02-04 22:25:59 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010, 2011 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
@@ -21,10 +21,10 @@
import sys
import time
-from bzrlib.tests import TestCaseInTempDir
-
-
-class TestDebugOption(TestCaseInTempDir):
+from bzrlib import debug, tests
+
+
+class TestDebugOption(tests.TestCaseInTempDir):
def test_dash_derror(self):
"""With -Derror, tracebacks are shown even for user errors"""
@@ -39,3 +39,22 @@
# With -Dlock, locking and unlocking is recorded into the log
self.run_bzr("-Dlock init foo")
self.assertContainsRe(self.get_log(), "lock_write")
+
+
+class TestDebugBytes(tests.TestCaseWithTransport):
+
+ def test_bytes_reports_activity(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/one'])
+ tree.add('one')
+ rev_id = tree.commit('first')
+ remote_trans = self.make_smart_server('.')
+ # I would like to avoid run_bzr_subprocess here, but we need it to be
+ # connected to a real TextUIFactory. The NullProgressView always
+ # ignores transport activity.
+ env = {'BZR_PROGRESS_BAR': 'text'}
+ out, err = self.run_bzr_subprocess('branch -Dbytes %s/tree target'
+ % (remote_trans.base,),
+ env_changes=env)
+ self.assertContainsRe(err, 'Branched 1 revision')
+ self.assertContainsRe(err, 'Transferred:.*kB')
=== modified file 'bzrlib/tests/per_repository_reference/__init__.py'
--- a/bzrlib/tests/per_repository_reference/__init__.py 2011-01-10 22:47:59 +0000
+++ b/bzrlib/tests/per_repository_reference/__init__.py 2011-02-08 11:06:03 +0000
@@ -105,6 +105,7 @@
'bzrlib.tests.per_repository_reference.test_fetch',
'bzrlib.tests.per_repository_reference.test_get_record_stream',
'bzrlib.tests.per_repository_reference.test_get_rev_id_for_revno',
+ 'bzrlib.tests.per_repository_reference.test_graph',
'bzrlib.tests.per_repository_reference.test_initialize',
'bzrlib.tests.per_repository_reference.test_unlock',
]
=== added file 'bzrlib/tests/per_repository_reference/test_graph.py'
--- a/bzrlib/tests/per_repository_reference/test_graph.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/per_repository_reference/test_graph.py 2011-02-08 08:01:40 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+"""Tests for graph operations on stacked repositories."""
+
+
+from bzrlib.tests.per_repository import TestCaseWithRepository
+
+
+class TestGraph(TestCaseWithRepository):
+
+ def test_get_known_graph_ancestry_stacked(self):
+ """get_known_graph_ancestry works correctly on stacking.
+
+ See <https://bugs.launchpad.net/bugs/715000>.
+ """
+ branch_a, branch_b, branch_c, revid_1 = self.make_double_stacked_branches()
+ for br in [branch_c]:
+ self.assertEquals(
+ [revid_1],
+ br.repository.get_known_graph_ancestry([revid_1]).topo_sort())
+
+ def make_double_stacked_branches(self):
+ wt_a = self.make_branch_and_tree('a')
+ branch_a = wt_a.branch
+ branch_b = self.make_branch('b')
+ branch_b.set_stacked_on_url('../a')
+ branch_c = self.make_branch('c')
+ branch_c.set_stacked_on_url('../b')
+ revid_1 = wt_a.commit('first commit')
+ return branch_a, branch_b, branch_c, revid_1
=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py 2010-08-28 15:34:24 +0000
+++ b/bzrlib/versionedfile.py 2011-02-08 11:06:03 +0000
@@ -1193,6 +1193,19 @@
def _extract_blocks(self, version_id, source, target):
return None
+ def _transitive_fallbacks(self):
+ """Return the whole stack of fallback versionedfiles.
+
+ This VersionedFiles may have a list of fallbacks, but it doesn't
+ necessarily know about the whole stack going down, and it can't know
+ at open time because they may change after the objects are opened.
+ """
+ all_fallbacks = []
+ for a_vfs in self._fallback_vfs:
+ all_fallbacks.append(a_vfs)
+ all_fallbacks.extend(a_vfs._transitive_fallbacks())
+ return all_fallbacks
+
class ThunkedVersionedFiles(VersionedFiles):
"""Storage for many versioned files thunked onto a 'VersionedFile' class.
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt 2011-02-02 14:33:27 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt 2011-02-04 14:10:48 +0000
@@ -8,13 +8,11 @@
bzr 2.2.4
#########
-:2.2.4: NOT RELEASED YET
-
-Compatibility Breaks
-********************
-
-New Features
-************
+:2.2.4: 2011-02-04
+
+This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
+involving only certain operations with launchpad. Upgrading is recommended for
+all users on earlier 2.2 releases.
Bug Fixes
*********
@@ -25,21 +23,6 @@
the default instance was switched from edge to production in bzr 2.2.3.
(Max Bowsher, #707075)
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
bzr 2.2.3
#########
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt 2011-02-07 03:24:37 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt 2011-02-08 11:12:11 +0000
@@ -5,10 +5,10 @@
.. toctree::
:maxdepth: 1
-bzr 2.3.0
+bzr 2.3.1
#########
-:2.3.0: NOT RELEASED YET
+:2.3.1: NOT RELEASED YET
External Compatibility Breaks
*****************************
@@ -32,6 +32,10 @@
.. Fixes for situations where bzr would previously crash or give incorrect
or undesirable results.
+* Restore proper logging of bytes transferred. We accidentally reset the
+ counter when commands finished before we logged the total transferred.
+ (John Arbash Meinel, #713258)
+
Documentation
*************
@@ -57,6 +61,28 @@
spurious test failures and changes to the way things should be tested.
+bzr 2.3.0
+#########
+
+:2.3.0: 2011-02-03
+
+This release marks the start of another long-term-stable series. From here, we
+will only make bugfix releases on the 2.3 series (2.3.1, etc, and support it
+until August 2012), while 2.4 will become our new development series. The 2.1
+and 2.2 series will also continue to get bugfixes. (Currently 2.0 is planned
+to be EOLed circa September 2011 and will receive only critical bugfixes.)
+
+This is a bugfix and polish release over the 2.2 series, with a large number
+of bugs fixed (>130), and some performance improvements. Some features have
+been enhanced including commits on stacked branches, upgrades of related
+branches, shortcut URL schemes for ubuntu and debian on launchpad and better
+conflict resolution.
+
+Only bugfixes from other stables series have been included since 2.3b5 so all
+known fixed bugs are included here.
+
+Users are encouraged to upgrade from the other stable series.
+
bzr 2.3b5
#########
=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt 2011-01-20 18:42:20 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt 2011-02-04 14:10:48 +0000
@@ -35,6 +35,9 @@
Bazaar 2.2.3 focused on fixes related to interactions with the launchpad
server and python-2.7 compatibility.
+Bazaar 2.2.4 fixed a regression for some interactions with the launchpad
+server.
+
See the :doc:`../release-notes/index` for details.
Bazaar 2.2 is fully compatible both locally and on the network with 2.0
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt 2011-01-20 23:41:26 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt 2011-02-08 11:12:11 +0000
@@ -2,20 +2,24 @@
What's New in Bazaar 2.3?
*************************
-Bazaar 2.3 is still under development, and will be released in February
-2011. This document accumulates a high level summary of what's changed.
+Bazaar 2.3 has been released on the 3rd of February 2011 and marks the start
+of another long-term-stable series. From here, we will only make bugfix
+releases on the 2.3 series (2.3.1, etc), while 2.4 will become our new
+development series. The 2.1 and 2.2 series will also continue to get
+bugfixes. (Currently 2.0 is planned to be EOLed circa September 2011.)
+
+This document accumulates a high level summary of what's changed.
See the
:doc:`../release-notes/index` for a full list.
-Users are encouraged to upgrade from the other stable series. This
-document outlines the improvements in Bazaar 2.3 vs Bazaar 2.2. As well as
-summarizing improvements made to the core product, it highlights
-enhancements within the broader Bazaar world of potential interest to
-those upgrading.
+Users are encouraged to upgrade from the other stable series. This document
+outlines the improvements in Bazaar 2.3 vs Bazaar 2.2. As well as summarizing
+improvements made to the core product, it highlights enhancements within the
+broader Bazaar world of potential interest to those upgrading.
-Bazaar 2.3.0 is fully compatible both locally and on the network with 2.0
-2.1, and 2.2, and can read and write repositories generated by all
-previous versions.
+Bazaar 2.3.0 is fully compatible both locally and on the network with 2.0 2.1,
+and 2.2, and can read and write repositories generated by all previous
+versions.
Changed Behaviour
*****************
@@ -171,17 +175,6 @@
working tree or branch as well as the ability to set or remove an
option. Scripts can also use it to get only the value for a given option.
-Expected releases for the 2.3 series
-************************************
-
-The 2.3 series has entered the beta phase and 2.3.0 should be released soon
-enough to be included into Natty Narwhal.
-
-As a rough estimate, consider that 2.3.0 will be released in February
-2011 and be supported until August 2012. Additional releases will be
-made if critical bugs are encountered
-
-
Further information
*******************
More information about the bazaar-commits
mailing list