Rev 2816: Fixup other interrepository tests failing due to the change to test subtrees. in http://people.ubuntu.com/~robertc/baz2.0/nested-tree

Robert Collins robertc at robertcollins.net
Wed Sep 12 04:16:13 BST 2007


At http://people.ubuntu.com/~robertc/baz2.0/nested-tree

------------------------------------------------------------
revno: 2816
revision-id: robertc at robertcollins.net-20070912031604-lzy05h9u6dyfrfgb
parent: robertc at robertcollins.net-20070912000548-b93ev6hxnfh202ks
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-tree
timestamp: Wed 2007-09-12 13:16:04 +1000
message:
  Fixup other interrepository tests failing due to the change to test subtrees.
modified:
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- a/bzrlib/tests/interrepository_implementations/test_interrepository.py	2007-09-12 00:05:48 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_interrepository.py	2007-09-12 03:16:04 +0000
@@ -294,18 +294,16 @@
         # repository.
 
         # 'ghost' is a ghost in missing_ghost and not in with_ghost_rev
-        inv = Inventory(revision_id='ghost')
-        inv.root.revision = 'ghost'
         repo = self.make_repository('with_ghost_rev')
-        sha1 = repo.add_inventory('ghost', inv, [])
-        rev = bzrlib.revision.Revision(timestamp=0,
-                                       timezone=None,
-                                       committer="Foo Bar <foo at example.com>",
-                                       message="Message",
-                                       inventory_sha1=sha1,
-                                       revision_id='ghost')
-        rev.parent_ids = []
-        repo.add_revision('ghost', rev)
+        repo.lock_write()
+        builder = repo.get_commit_builder(None, [], None,
+            committer="Foo Bar <foo at example.com>",
+            revision_id='ghost')
+        ie = bzrlib.inventory.InventoryDirectory('TREE_ROOT', '', None)
+        builder.record_entry_contents(ie, [], '', None)
+        builder.finish_inventory()
+        builder.commit("Message")
+        repo.unlock()
          
         repo = self.make_to_repository('missing_ghost')
         inv = Inventory(revision_id='with_ghost')



More information about the bazaar-commits mailing list