Merge lp:~jelmer/bzr-loom/fix-record-entry-contents into lp:bzr-loom

[Jelmer Vernooij]

Pass parent inventories to record_entry_contents rather than the list of parent revision ids.

I discovered this because of a failing test, but I'm not entirely sure why we didn't see failures from this earlier.

[Vincent Ladeuil (vila)]

Which was failing and in which context ?

review: Approve

[Jelmer Vernooij (jelmer)]

with bzr 2.4b5:

ERROR: bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom.te..
    log: {{{
1.995 creating repository in file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/.bzr/.
1.997 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x211b890> in file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/
2.002 trying to create missing lock '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/.bzr/checkout/dirstate'
2.003 opening working tree '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source'
2.010 opening working tree '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source'
2.013 opening working tree '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source'
2.031 opening working tree '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source'
2.038 creating repository in file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target/.bzr/.
2.041 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target/.bzr/repository/')(RepositoryFormat2a())
2.041 fetching: <PendingAncestryResult heads:frozenset([]) repo:CHKInventoryRepository('file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/.bzr/repository/')>
2.041 creating branch <bzrlib.plugins.loom.branch.BzrBranchLoomFormat7 object at 0x1c1c250> in file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target/
2.053 created new branch LoomBranch7(file:///tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target/)
2.054 trying to create missing lock '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target/.bzr/checkout/dirstate'
2.054 opening working tree '/tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/target'
2.072 preparing to commit
    INFO Committing to: /tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_push_loom_loom/work/source/
2.074 Selecting files for commit with filter None
    INFO Committed revision 1.
2.083 Committed revid <email address hidden> as revno 1.
2.090 Base revid: 'null:'
    INFO All changes applied successfully.
    INFO Moved to thread 'top'.
    INFO This thread is now empty, you may wish to run "bzr combine-thread" to remove it.
2.101 preparing to commit
    INFO Committing to: /tmp/testbzr-LeYSME.tmp/bzrlib.plugins.loom.tests.test_branch.TestL...

=== modified file 'branch.py'
--- branch.py	2011-06-23 19:06:47 +0000
+++ branch.py	2011-07-19 16:44:43 +0000
@@ -467,7 +467,7 @@
             builder.record_entry_contents(root_ie, [], '', loom_tree,
                 ('directory', None, None, None))
         builder.record_entry_contents(
-            loom_ie, parents, 'loom', loom_tree,
+            loom_ie, list(self.repository.iter_inventories(parents)), 'loom', loom_tree,
             # a fake contents so that the file is determined as changed.
             ('file', 0, False, None))
         builder.finish_inventory()