~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-13 22:33:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2287.
  • Revision ID: john@arbash-meinel.com-20070213223316-dlowmy4as5xhe921
Avoid deserializing an inventory we have already parsed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
521
521
        # TODO: Make sure that this list doesn't contain duplicate 
522
522
        # entries and the order is preserved when doing this.
523
523
        self.parents = self.work_tree.get_parent_ids()
524
 
        self.parent_invs = []
525
 
        for revision in self.parents:
 
524
        self.parent_invs = [self.basis_inv]
 
525
        for revision in self.parents[1:]:
526
526
            if self.branch.repository.has_revision(revision):
527
527
                mutter('commit parent revision {%s}', revision)
528
528
                inventory = self.branch.repository.get_inventory(revision)