Rev 4549: Change the tree transform test_first_commit test to set a root id in the new tree, and workaround an apparent bug in TreeTransform._determine_path. in http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta

Robert Collins robertc at robertcollins.net
Mon Jul 20 07:06:26 BST 2009


At http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta

------------------------------------------------------------
revno: 4549
revision-id: robertc at robertcollins.net-20090720060622-ey7a2b2cegan37yh
parent: robertc at robertcollins.net-20090720051953-rohq200jtq2vyhhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: apply-inventory-delta
timestamp: Mon 2009-07-20 16:06:22 +1000
message:
  Change the tree transform test_first_commit test to set a root id in the new tree, and workaround an apparent bug in TreeTransform._determine_path.
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2009-07-15 13:45:28 +0000
+++ b/bzrlib/tests/test_transform.py	2009-07-20 06:06:22 +0000
@@ -1916,6 +1916,7 @@
         branch.lock_write()
         self.addCleanup(branch.unlock)
         tt = TransformPreview(branch.basis_tree())
+        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
         rev = tt.commit(branch, 'my message')
         self.assertEqual([], branch.basis_tree().get_parent_ids())
         self.assertNotEqual(_mod_revision.NULL_REVISION,

=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2009-07-15 13:45:28 +0000
+++ b/bzrlib/transform.py	2009-07-20 06:06:22 +0000
@@ -2079,7 +2079,7 @@
         self.transform = transform
 
     def _determine_path(self, trans_id):
-        if trans_id == self.transform.root:
+        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
             return ""
         name = self.transform.final_name(trans_id)
         parent_id = self.transform.final_parent(trans_id)




More information about the bazaar-commits mailing list