passes in parent revision ids rather than inventories to CommitBuilder.record_entry_contents

Bug #813007 reported by Jelmer Vernooij on 2011-07-19
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Loom
High
Jelmer Vernooij

Bug Description

This is triggering test failures with newer versions of bzr:

> ======================================================================
> ERROR: bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom
> ----------------------------------------------------------------------
> _StringException: Text attachment: log
> ------------
> 0.446 creating repository in file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/.bzr/.
> 0.449 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x2a954d0> in file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/
> 0.456 trying to create missing lock '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/.bzr/checkout/dirstate'
> 0.456 opening working tree '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source'
> 0.462 opening working tree '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source'
> 0.466 opening working tree '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source'
> 0.486 opening working tree '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source'
> 0.501 creating repository in file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target/.bzr/.
> 0.504 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target/.bzr/repository/')(RepositoryFormat2a())
> 0.504 fetching: <PendingAncestryResult heads:frozenset([]) repo:CHKInventoryRepository('file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/.bzr/repository/')>
> 0.504 creating branch <bzrlib.plugins.loom.branch.BzrBranchLoomFormat7 object at 0x2b6be10> in file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target/
> 0.522 created new branch LoomBranch7(file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target/)
> 0.524 trying to create missing lock '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target/.bzr/checkout/dirstate'
> 0.525 opening working tree '/tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/target'
> 0.544 preparing to commit
> INFO Committing to: /tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/
> 0.549 Selecting files for commit with filter None
> INFO Committed revision 1.
> 0.558 Committed revid <email address hidden> as revno 1.
> 0.564 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.
> 0.576 preparing to commit
> INFO Committing to: /tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/
> 0.579 Selecting files for commit with filter None
> INFO Committed revision 2.
> 0.588 Committed revid <email address hidden> as revno 2.
> INFO All changes applied successfully.
> INFO Moved to thread 'bottom'.
> 0.605 preparing to commit
> INFO Committing to: /tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/
> 0.608 Selecting files for commit with filter None
> INFO Committed revision 2.
> 0.616 Committed revid <email address hidden> as revno 2.
> 0.625 Error suppressed by only_raises:
> 0.625 Traceback (most recent call last):
> File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 248, in wrapped
> return unbound(*args, **kwargs)
> File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 1817, in unlock
> % self)
> BzrError: Must end write group before releasing write lock on CHKInventoryRepository('file:///tmp/testbzr-xbvyhC.tmp/bzrlib.plugins.loom.tests.test_branch.TestLoom.test_pull_loom_at_bottom/work/source/.bzr/repository/')
>
> 0.634 opening working tree '/tmp/testbzr-xbvyhC.tmp'
> ------------
> Text attachment: traceback
> ------------
> Traceback (most recent call last):
> File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 169, in _run_user
> return fn(*args, **kwargs)
> File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 540, in _run_test_method
> return self._get_test_method()()
> File "/build/bzr-loom-FDkjmX/bzr-loom-2.1+bzr132/tests/test_branch.py", line 364, in test_pull_loom_at_bottom
> source.branch.record_loom('commit to loom again')
> File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 217, in write_locked
> result = unbound(self, *args, **kwargs)
> File "/build/bzr-loom-FDkjmX/bzr-loom-2.1+bzr132/branch.py", line 470, in record_loom
> ('file', 0, False, None))
> File "/usr/lib/python2.6/dist-packages/bzrlib/vf_repository.py", line 422, in record_entry_contents
> parent_candiate_entries = ie.parent_candidates(parent_invs)
> File "/usr/lib/python2.6/dist-packages/bzrlib/inventory.py", line 175, in parent_candidates
> if inv.has_id(self.file_id):
> AttributeError: 'str' object has no attribute 'has_id'
> ------------
>

Related branches

Jelmer Vernooij (jelmer) on 2011-07-19
Changed in bzr-loom:
status: New → Triaged
importance: Undecided → Medium
importance: Medium → High
assignee: nobody → Jelmer Vernooij (jelmer)
status: Triaged → In Progress
Jelmer Vernooij (jelmer) on 2011-08-18
Changed in bzr-loom:
status: In Progress → Fix Committed
milestone: none → 2.2
Jelmer Vernooij (jelmer) on 2012-02-26
Changed in bzr-loom:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers