Rev 2471: Split test_root_revision_entry into tree and repository portions. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

Robert Collins robertc at robertcollins.net
Thu Mar 1 07:28:44 GMT 2007


At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2471
revision-id: robertc at robertcollins.net-20070301072736-dc00wtcb7py592re
parent: robertc at robertcollins.net-20070301071122-yhy7vchlazynnb8y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 18:27:36 +1100
message:
  Split test_root_revision_entry into tree and repository portions.
modified:
  bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/tests/repository_implementations/test_commit_builder.py'
--- a/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-02-26 15:27:17 +0000
+++ b/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-03-01 07:27:36 +0000
@@ -126,3 +126,14 @@
         # the RevisionTree api.
         self.assertEqual(rev_id, rev_tree.get_revision_id())
         self.assertEqual([], rev_tree.get_parent_ids())
+
+    def test_root_entry_has_revision(self):
+        # test the root revision created and put in the basis
+        # has the right rev id.
+        tree = self.make_branch_and_tree('.')
+        rev_id = tree.commit('message')
+        basis_tree = tree.basis_tree()
+        basis_tree.lock_read()
+        self.addCleanup(basis_tree.unlock)
+        self.assertEqual(rev_id, basis_tree.inventory.root.revision)
+

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-03-01 07:11:22 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-03-01 07:27:36 +0000
@@ -361,8 +361,7 @@
     def test_root_entry_has_revision(self):
         tree = self.make_branch_and_tree('.')
         tree.commit('message', rev_id='rev_id')
-        self.assertEqual('rev_id', tree.basis_tree().inventory.root.revision)
-        rev_tree = tree.branch.repository.revision_tree(tree.get_parent_ids()[0])
+        rev_tree = tree.branch.repository.revision_tree(tree.last_revision())
         self.assertEqual('rev_id', rev_tree.inventory.root.revision)
 
     def DISABLED_DELETE_OR_FIX_BEFORE_MERGE_test_create_basis_inventory(self):

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-01 06:19:44 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-01 07:27:36 +0000
@@ -1071,7 +1071,6 @@
         wt._new_tree()
         wt.lock_tree_write()
         try:
-            #wt.current_dirstate().set_path_id('', NEWROOT)
             wt.set_last_revision(revision_id)
             wt.flush()
             basis = wt.basis_tree()



More information about the bazaar-commits mailing list