Rev 2439: Fixes for some comparison tests; repr of DirStateRevisionTree in file:///home/mbp/bzr/Work/subtree/
Martin Pool
mbp at sourcefrog.net
Mon Mar 5 05:49:53 GMT 2007
------------------------------------------------------------
revno: 2439
revision-id: mbp at sourcefrog.net-20070305054951-gvy36e097zta9nyj
parent: mbp at sourcefrog.net-20070305050600-4oib0crvql5oiedd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:49:51 +1100
message:
Fixes for some comparison tests; repr of DirStateRevisionTree
modified:
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py 2007-03-05 04:55:34 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py 2007-03-05 05:49:51 +0000
@@ -299,6 +299,7 @@
def test_default_ignores_unversioned_files(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
+ tree2.set_root_id(tree1.get_root_id())
self.build_tree(['tree1/a', 'tree1/c',
'tree2/a', 'tree2/b', 'tree2/c'])
tree1.add(['a', 'c'], ['a-id', 'c-id'])
@@ -317,6 +318,7 @@
def test_unversioned_paths_in_tree(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
+ tree2.set_root_id(tree1.get_root_id())
self.build_tree(['tree2/file', 'tree2/dir/'])
# try:
os.symlink('target', 'tree2/link')
@@ -714,17 +716,23 @@
subtree2 = self.make_to_branch_and_tree('2/sub')
subtree2.set_root_id('subtree-id')
tree2.add_reference(subtree2)
- self.assertEqual([], list(tree2._iter_changes(tree1)))
- subtree1.commit('commit', rev_id='commit-a')
- self.assertEqual([('subtree-id',
- 'sub',
- True,
- (True, True),
- ('root-id', 'root-id'),
- ('sub', 'sub'),
- ('tree-reference', 'tree-reference'),
- (False, False))],
- list(tree2._iter_changes(tree1)))
+ tree1.lock_read()
+ tree2.lock_read()
+ try:
+ self.assertEqual([], list(tree2._iter_changes(tree1)))
+ subtree1.commit('commit', rev_id='commit-a')
+ self.assertEqual([('subtree-id',
+ 'sub',
+ True,
+ (True, True),
+ ('root-id', 'root-id'),
+ ('sub', 'sub'),
+ ('tree-reference', 'tree-reference'),
+ (False, False))],
+ list(tree2._iter_changes(tree1)))
+ finally:
+ tree1.unlock()
+ tree2.unlock()
def test_default_ignores_unversioned_files(self):
tree1 = self.make_branch_and_tree('tree1')
@@ -751,6 +759,7 @@
def test_unversioned_paths_in_tree(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
+ tree2.set_root_id(tree1.get_root_id())
self.build_tree(['tree2/file', 'tree2/dir/'])
# try:
os.symlink('target', 'tree2/link')
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-03-05 05:06:00 +0000
+++ b/bzrlib/workingtree_4.py 2007-03-05 05:49:51 +0000
@@ -1221,6 +1221,10 @@
self._locked = 0
self._dirstate_locked = False
+ def __repr__(self):
+ return "<%s of %s in %s>" % \
+ (self.__class__.__name__, self._revision_id, self._dirstate)
+
def annotate_iter(self, file_id):
"""See Tree.annotate_iter"""
w = self._repository.weave_store.get_weave(file_id,
More information about the bazaar-commits
mailing list