/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzr_commit_handler.py

  • Committer: Ian Clatworthy
  • Date: 2009-08-22 08:09:13 UTC
  • mto: (0.64.225 trunk)
  • mto: This revision was merged to the branch mainline in revision 6631.
  • Revision ID: ian.clatworthy@canonical.com-20090822080913-36mvcb6c1fqt8gok
better diagnostics on inconsistent delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr_commit_handler.py
603
603
    def _get_proposed_inventory(self, delta):
604
604
        if len(self.parents):
605
605
            new_inv = self.basis_inventory._get_mutable_inventory()
606
 
            new_inv.apply_delta(delta)
607
606
        else:
608
607
            new_inv = inventory.Inventory(revision_id=self.revision_id)
609
608
            # This is set in the delta so remove it to prevent a duplicate
610
609
            del new_inv[inventory.ROOT_ID]
 
610
        try:
611
611
            new_inv.apply_delta(delta)
 
612
        except errors.InconsistentDelta:
 
613
            self.mutter("INCONSISTENT DELTA IS:\n%s" % "\n".join([str(de) for de in delta]))
 
614
            raise
612
615
        return new_inv
613
616
 
614
617
    def _add_entry(self, entry):