Rev 4959: (jam) Merge bzr.stable, bringing in bug fixes #175839, #504390 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jan 14 00:01:36 GMT 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4959 [merge]
revision-id: pqm at pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
parent: pqm at pqm.ubuntu.com-20100113232610-800659eowcz1yr9z
parent: john at arbash-meinel.com-20100113230642-gr0vg8u3qyzz3p2b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-01-14 00:01:32 +0000
message:
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390
added:
MANIFEST.in manifest.in-20100109214549-ime1ec4zij1zkovi-1
README_BDIST_RPM readme_bdist_rpm-20100109220335-taksndjgxmwnre5e-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/per_workingtree/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/per_workingtree/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
=== added file 'MANIFEST.in'
--- a/MANIFEST.in 1970-01-01 00:00:00 +0000
+++ b/MANIFEST.in 2010-01-13 16:23:07 +0000
@@ -0,0 +1,3 @@
+include bzr README setup.py
+recursive-include bzrlib *.py *.pyx *.pxd *.txt *.c *.h
+recursive-include tools *.py *.sh
=== modified file 'NEWS'
--- a/NEWS 2010-01-13 23:26:10 +0000
+++ b/NEWS 2010-01-14 00:01:32 +0000
@@ -223,6 +223,12 @@
* Give a clearer message if the lockdir disappears after being apparently
successfully taken. (Martin Pool, #498378)
+* Give a warning when fetching between local repositories with
+ sufficiently different formats that the content will need to be
+ serialized (ie ``InterDifferingSerializer``) so the user has a clue that
+ upgrading could make it faster.
+ (Martin Pool, #456077)
+
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
than using ``warning()``. The log file is opened before logging is set
up, and it leads to very confusing: 'no handlers for "bzr"' messages for
@@ -232,6 +238,10 @@
* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
(Martin Pool, John Arbash Meinel, #449372)
+* ``setup.py bdist_rpm`` now properly finds extra files needed for the
+ build. (there is still the distutils bug
+ http://bugs.python.org/issue644744) (Joe Julian, #175839)
+
* The 2a format wasn't properly restarting autopacks when something
changed underneath it (like another autopack). Now concurrent
autopackers will properly succeed. (John Arbash Meinel, #495000)
@@ -239,9 +249,8 @@
* ``TreeTransform`` can now handle when a delta says that the file id for
the tree root changes. Rather than trying to rename your working
directory, or failing early saying that you can't have multiple
- tree roots. This also fixes ``bzr revert`` when the root id changes.
- (Currently ``bzr update`` is still broken.)
- (John Arbash Meinel, #494269)
+ tree roots. This also fixes revert, update, and pull when the root id
+ changes. (John Arbash Meinel, #494269, #504390)
* ``_update_current_block`` no longer suppresses exceptions, so ^C at just
the right time will get propagated, rather than silently failing to move
=== added file 'README_BDIST_RPM'
--- a/README_BDIST_RPM 1970-01-01 00:00:00 +0000
+++ b/README_BDIST_RPM 2010-01-10 02:25:31 +0000
@@ -0,0 +1,8 @@
+There is a bug in disttools for distributions who's rpmbuild compresses
+the man pages. This causes an error building the final packages as it's
+expecting bzr.1 and not finding it, but finding bzr.1.gz that's unpackaged.
+
+This bug is known to affect Fedora, RHEL, and Centos distributions.
+
+There is a preliminary patch at http://bugs.python.org/issue644744 that
+fixes this issue with disttools.
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2009-11-08 19:29:02 +0000
+++ b/bzrlib/dirstate.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 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
@@ -1997,6 +1997,8 @@
entry_index, present = self._find_entry_index(key, block)
if present:
entry = self._dirblocks[block_index][1][entry_index]
+ # TODO: We might want to assert that entry[0][2] ==
+ # fileid_utf8.
if entry[1][tree_index][0] in 'fdlt':
# this is the result we are looking for: the
# real home of this file_id in this tree.
@@ -2354,8 +2356,6 @@
self.update_minimal(('', '', new_id), 'd',
path_utf8='', packed_stat=entry[1][0][4])
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
- if self._id_index is not None:
- self._id_index.setdefault(new_id, set()).add(entry[0])
def set_parent_trees(self, trees, ghosts):
"""Set the parent trees for the dirstate.
@@ -3013,6 +3013,13 @@
if absent_positions == tree_count:
raise AssertionError(
"entry %r has no data for any tree." % (entry,))
+ if self._id_index is not None:
+ for file_id, entry_keys in self._id_index.iteritems():
+ for entry_key in entry_keys:
+ if entry_key[2] != file_id:
+ raise AssertionError(
+ 'file_id %r did not match entry key %s'
+ % (file_id, entry_key))
def _wipe_state(self):
"""Forget all state information about the dirstate."""
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-12-17 10:01:25 +0000
+++ b/bzrlib/repository.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 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
@@ -41,6 +41,7 @@
osutils,
revision as _mod_revision,
symbol_versioning,
+ trace,
tsort,
ui,
versionedfile,
@@ -4008,6 +4009,15 @@
"""See InterRepository.fetch()."""
if fetch_spec is not None:
raise AssertionError("Not implemented yet...")
+ # See <https://launchpad.net/bugs/456077> asking for a warning here
+ #
+ # nb this is only active for local-local fetches; other things using
+ # streaming.
+ trace.warning("Fetching between repositories with different formats\n"
+ "from %s to %s.\n"
+ "This may take some time. Upgrade the branches to the same format \n"
+ "for better results.\n"
+ % (self.source._format, self.target._format))
if (not self.source.supports_rich_root()
and self.target.supports_rich_root()):
self._converting_to_rich_root = True
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2009-06-15 06:47:14 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 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
@@ -390,4 +390,14 @@
self.assertLength(18, self.hpss_calls)
remote = Branch.open('stacked')
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
+
+ def test_pull_cross_format_warning(self):
+ """You get a warning for probably slow cross-format pulls.
+ """
+ from_tree = self.make_branch_and_tree('from', format='2a')
+ to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
+ from_tree.commit(message='first commit')
+ out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
+ self.assertContainsRe(err,
+ "(?m)Fetching between repositories with different formats.*")
=== modified file 'bzrlib/tests/per_workingtree/test_pull.py'
--- a/bzrlib/tests/per_workingtree/test_pull.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_pull.py 2010-01-11 23:02:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
# Authors: Robert Collins <robert.collins at canonical.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -56,3 +56,15 @@
tree_b.pull(tree_a.branch)
self.assertFileEqual('contents of from/file\n', 'to/file')
+ def test_pull_changes_root_id(self):
+ tree = self.make_branch_and_tree('from')
+ tree.set_root_id('first_root_id')
+ self.build_tree(['from/file'])
+ tree.add(['file'])
+ tree.commit('first')
+ to_tree = tree.bzrdir.sprout('to').open_workingtree()
+ self.assertEqual('first_root_id', to_tree.get_root_id())
+ tree.set_root_id('second_root_id')
+ tree.commit('second')
+ to_tree.pull(tree.branch)
+ self.assertEqual('second_root_id', to_tree.get_root_id())
=== modified file 'bzrlib/tests/per_workingtree/test_set_root_id.py'
--- a/bzrlib/tests/per_workingtree/test_set_root_id.py 2009-09-11 07:55:48 +0000
+++ b/bzrlib/tests/per_workingtree/test_set_root_id.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 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
@@ -18,7 +18,7 @@
import sys
-from bzrlib import inventory
+from bzrlib import errors, inventory
from bzrlib.tests import TestSkipped
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
@@ -53,3 +53,19 @@
# should still be retained
tree = tree.bzrdir.open_workingtree()
self.assertEqual(root_id, tree.get_root_id())
+ tree._validate()
+
+ def test_set_root_id(self):
+ tree = self.make_branch_and_tree('.')
+ tree.lock_write()
+ self.addCleanup(tree.unlock)
+ orig_root_id = tree.get_root_id()
+ self.assertNotEqual('custom-root-id', orig_root_id)
+ self.assertEqual('', tree.id2path(orig_root_id))
+ self.assertRaises(errors.NoSuchId, tree.id2path, 'custom-root-id')
+ tree.set_root_id('custom-root-id')
+ self.assertEqual('custom-root-id', tree.get_root_id())
+ self.assertEqual('custom-root-id', tree.path2id(''))
+ self.assertEqual('', tree.id2path('custom-root-id'))
+ self.assertRaises(errors.NoSuchId, tree.id2path, orig_root_id)
+ tree._validate()
=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py 2009-12-22 07:03:38 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
# Authors: Robert Collins <robert.collins at canonical.com>
# and others
#
@@ -478,6 +478,20 @@
self.assertEqual(wt.get_root_id(), checkout.get_root_id())
self.assertNotEqual(None, wt.get_root_id())
+ def test_update_sets_updated_root_id(self):
+ wt = self.make_branch_and_tree('tree')
+ wt.set_root_id('first_root_id')
+ self.assertEqual('first_root_id', wt.get_root_id())
+ self.build_tree(['tree/file'])
+ wt.add(['file'])
+ wt.commit('first')
+ co = wt.branch.create_checkout('checkout')
+ wt.set_root_id('second_root_id')
+ wt.commit('second')
+ self.assertEqual('second_root_id', wt.get_root_id())
+ self.assertEqual(0, co.update())
+ self.assertEqual('second_root_id', co.get_root_id())
+
def test_update_returns_conflict_count(self):
# working tree formats from the meta-dir format and newer support
# setting the last revision on a tree independently of that on the
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py 2009-08-17 03:33:56 +0000
+++ b/bzrlib/tests/test_dirstate.py 2010-01-12 20:51:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 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
@@ -873,15 +873,23 @@
state = dirstate.DirState.initialize('dirstate')
try:
# check precondition to be sure the state does change appropriately.
- self.assertEqual(
- [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
- 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
- list(state._iter_entries()))
- state.set_path_id('', 'foobarbaz')
- expected_rows = [
- (('', '', 'foobarbaz'), [('d', '', 0, False,
- 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
+ root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
+ self.assertEqual([root_entry], list(state._iter_entries()))
+ self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
+ self.assertEqual(root_entry,
+ state._get_entry(0, fileid_utf8='TREE_ROOT'))
+ self.assertEqual((None, None),
+ state._get_entry(0, fileid_utf8='second-root-id'))
+ state.set_path_id('', 'second-root-id')
+ new_root_entry = (('', '', 'second-root-id'),
+ [('d', '', 0, False, 'x'*32)])
+ expected_rows = [new_root_entry]
self.assertEqual(expected_rows, list(state._iter_entries()))
+ self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
+ self.assertEqual(new_root_entry,
+ state._get_entry(0, fileid_utf8='second-root-id'))
+ self.assertEqual((None, None),
+ state._get_entry(0, fileid_utf8='TREE_ROOT'))
# should work across save too
state.save()
finally:
@@ -905,21 +913,36 @@
state._validate()
try:
state.set_parent_trees([('parent-revid', rt)], ghosts=[])
- state.set_path_id('', 'foobarbaz')
+ root_entry = (('', '', 'TREE_ROOT'),
+ [('d', '', 0, False, 'x'*32),
+ ('d', '', 0, False, 'parent-revid')])
+ self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
+ self.assertEqual(root_entry,
+ state._get_entry(0, fileid_utf8='TREE_ROOT'))
+ self.assertEqual((None, None),
+ state._get_entry(0, fileid_utf8='Asecond-root-id'))
+ state.set_path_id('', 'Asecond-root-id')
state._validate()
# now see that it is what we expected
- expected_rows = [
- (('', '', 'TREE_ROOT'),
- [('a', '', 0, False, ''),
- ('d', '', 0, False, 'parent-revid'),
- ]),
- (('', '', 'foobarbaz'),
- [('d', '', 0, False, ''),
- ('a', '', 0, False, ''),
- ]),
- ]
+ old_root_entry = (('', '', 'TREE_ROOT'),
+ [('a', '', 0, False, ''),
+ ('d', '', 0, False, 'parent-revid')])
+ new_root_entry = (('', '', 'Asecond-root-id'),
+ [('d', '', 0, False, ''),
+ ('a', '', 0, False, '')])
+ expected_rows = [new_root_entry, old_root_entry]
state._validate()
self.assertEqual(expected_rows, list(state._iter_entries()))
+ self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
+ self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
+ self.assertEqual((None, None),
+ state._get_entry(0, fileid_utf8='TREE_ROOT'))
+ self.assertEqual(old_root_entry,
+ state._get_entry(1, fileid_utf8='TREE_ROOT'))
+ self.assertEqual(new_root_entry,
+ state._get_entry(0, fileid_utf8='Asecond-root-id'))
+ self.assertEqual((None, None),
+ state._get_entry(1, fileid_utf8='Asecond-root-id'))
# should work across save too
state.save()
finally:
=== modified file 'bzrlib/tests/test_shelf.py'
--- a/bzrlib/tests/test_shelf.py 2009-09-11 07:55:48 +0000
+++ b/bzrlib/tests/test_shelf.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 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
@@ -108,6 +108,29 @@
creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
self.check_shelve_move(creator, tree)
+ def test_shelve_changed_root_id(self):
+ tree = self.make_branch_and_tree('.')
+ self.build_tree(['foo'])
+ tree.set_root_id('first-root-id')
+ tree.add(['foo'], ['foo-id'])
+ tree.commit('foo')
+ tree.set_root_id('second-root-id')
+ tree.lock_tree_write()
+ self.addCleanup(tree.unlock)
+ creator = shelf.ShelfCreator(tree, tree.basis_tree())
+ self.addCleanup(creator.finalize)
+ self.expectFailure('shelf doesn\'t support shelving root changes yet',
+ self.assertEqual, [
+ ('delete file', 'first-root-id', 'directory', ''),
+ ('add file', 'second-root-id', 'directory', ''),
+ ('rename', 'foo-id', u'foo', u'foo'),
+ ], list(creator.iter_shelvable()))
+
+ self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
+ ('add file', 'second-root-id', 'directory', ''),
+ ('rename', 'foo-id', u'foo', u'foo'),
+ ], list(creator.iter_shelvable()))
+
def assertShelvedFileEqual(self, expected_content, creator, file_id):
s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
=== modified file 'bzrlib/tests/test_switch.py'
--- a/bzrlib/tests/test_switch.py 2009-05-07 05:08:46 +0000
+++ b/bzrlib/tests/test_switch.py 2010-01-12 18:10:23 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 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
@@ -100,6 +100,18 @@
self.assertContainsRe(str(err),
"Pending merges must be committed or reverted before using switch")
+ def test_switch_changing_root_id(self):
+ tree = self._setup_tree()
+ tree2 = self.make_branch_and_tree('tree-2')
+ tree2.set_root_id('custom-root-id')
+ self.build_tree(['tree-2/file-2'])
+ tree2.add(['file-2'])
+ tree2.commit('rev1b')
+ checkout = tree.branch.create_checkout('checkout',
+ lightweight=self.lightweight)
+ switch.switch(checkout.bzrdir, tree2.branch)
+ self.assertEqual('custom-root-id', tree2.get_root_id())
+
class TestSwitchHeavyweight(TestSwitch):
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2010-01-12 21:08:30 +0000
+++ b/bzrlib/tests/test_transform.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006-2010 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/transform.py'
--- a/bzrlib/transform.py 2010-01-12 21:08:30 +0000
+++ b/bzrlib/transform.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006-2010 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/workingtree.py'
--- a/bzrlib/workingtree.py 2009-12-22 05:24:50 +0000
+++ b/bzrlib/workingtree.py 2010-01-13 23:06:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 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
@@ -1627,9 +1627,10 @@
this_tree=self,
pb=pb,
change_reporter=change_reporter)
- if (basis_tree.inventory.root is None and
- new_basis_tree.inventory.root is not None):
- self.set_root_id(new_basis_tree.get_root_id())
+ basis_root_id = basis_tree.get_root_id()
+ new_root_id = new_basis_tree.get_root_id()
+ if basis_root_id != new_root_id:
+ self.set_root_id(new_root_id)
finally:
pb.finished()
basis_tree.unlock()
@@ -2274,8 +2275,10 @@
basis.lock_read()
try:
to_tree = self.branch.repository.revision_tree(revision)
- if basis.inventory.root is None:
- self.set_root_id(to_tree.get_root_id())
+ to_root_id = to_tree.get_root_id()
+ if (basis.inventory.root is None
+ or basis.inventory.root.file_id != to_root_id):
+ self.set_root_id(to_root_id)
self.flush()
result += merge.merge_inner(
self.branch,
More information about the bazaar-commits
mailing list