← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-05 01:52:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090805015213-udx65ipzxvfs0ezh
Cosmetic tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
4055
4055
            deserialiser = inventory_delta.InventoryDeltaSerializer()
4056
4056
            parse_result = deserialiser.parse_text_bytes(inventory_delta_bytes)
4057
4057
            basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4058
 
            #mutter('inv_delta: %r', inv_delta)
4059
4058
            # Make sure the delta is compatible with the target
4060
4059
            if rich_root and not target_rich_root:
4061
4060
                raise errors.IncompatibleRevision(self.target_repo._format)
4065
4064
                for delta_item in inv_delta:
4066
4065
                    entry = delta_item[3]
4067
4066
                    if entry.kind == 'tree-reference':
4068
 
                        raise errors.IncompatibleRevision(self.target_repo._format)
4069
 
            #revision_id = new_id[0]
 
4067
                        raise errors.IncompatibleRevision(
 
4068
                            self.target_repo._format)
4070
4069
            revision_id = new_id
4071
4070
            parents = [key[0] for key in record.parents]
4072
4071
            self.target_repo.add_inventory_by_delta(