Rev 2257: Partial updates for API changes in trunk. in file:///home/robertc/source/baz/dirstate/
Robert Collins
robertc at robertcollins.net
Thu Feb 8 00:11:07 GMT 2007
At file:///home/robertc/source/baz/dirstate/
------------------------------------------------------------
revno: 2257
revision-id: robertc at robertcollins.net-20070208001102-k5hy63o7om2amnp1
parent: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-08 11:11:02 +1100
message:
Partial updates for API changes in trunk.
modified:
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py 2006-12-08 03:19:36 +0000
+++ b/bzrlib/tests/test_dirstate.py 2007-02-08 00:11:02 +0000
@@ -256,9 +256,15 @@
# set_parent_trees is a slow but important api to support.
state = dirstate.DirState.initialize('dirstate')
tree1 = self.make_branch_and_memory_tree('tree1')
+ tree1.lock_write()
+ tree1.add('')
revid1 = tree1.commit('foo')
+ tree1.unlock()
tree2 = self.make_branch_and_memory_tree('tree2')
+ tree2.lock_write()
+ tree2.add('')
revid2 = tree2.commit('foo')
+ tree2.unlock()
state.set_parent_trees(
((revid1, tree1.branch.repository.revision_tree(revid1)),
(revid2, tree2.branch.repository.revision_tree(revid2)),
=== modified file 'bzrlib/tests/test_workingtree.py'
--- a/bzrlib/tests/test_workingtree.py 2007-02-02 04:55:26 +0000
+++ b/bzrlib/tests/test_workingtree.py 2007-02-08 00:11:02 +0000
@@ -235,13 +235,13 @@
control.create_branch()
tree = workingtree.WorkingTreeFormat4().initialize(control)
# we want:
- # format 'Bazaar-NG Working Tree format 4'
+ # format 'Bazaar Working Tree format 4'
# inventory = blank inventory
# pending-merges = ''
# stat-cache = ??
# no inventory.basis yet
t = control.get_workingtree_transport(None)
- self.assertEqualDiff('Bazaar-NG Working Tree format 4',
+ self.assertEqualDiff('Bazaar Working Tree format 4',
t.get('format').read())
self.assertEqualDiff('<inventory format="5">\n'
'</inventory>\n',
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2007-02-02 04:55:26 +0000
+++ b/bzrlib/workingtree.py 2007-02-08 00:11:02 +0000
@@ -2664,7 +2664,7 @@
wt._write_inventory(inv)
wt.set_root_id(inv.root.file_id)
wt.set_last_revision(revision_id)
- build_tree(wt.basis_tree(), wt)
+ transform.build_tree(wt.basis_tree(), wt)
finally:
control_files.unlock()
wt.unlock()
More information about the bazaar-commits
mailing list