← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2005-10-06 01:30:12 UTC
  • Revision ID: robertc@robertcollins.net-20051006013012-27a91dece71dc318
we do not need revision_trees in commit, parent inventories are sufficient

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
279
279
        """Record the parents of a merge for merge detection."""
280
280
        pending_merges = self.branch.pending_merges()
281
281
        self.parents = []
282
 
        self.parent_trees = []
 
282
        self.parent_invs = []
283
283
        self.present_parents = []
284
284
        precursor_id = self.branch.last_revision()
285
285
        if precursor_id:
287
287
        self.parents += pending_merges
288
288
        for revision in self.parents:
289
289
            if self.branch.has_revision(revision):
290
 
                self.parent_trees.append(self.branch.revision_tree(revision))
 
290
                self.parent_invs.append(self.branch.get_inventory(revision))
291
291
                self.present_parents.append(revision)
292
292
 
293
293
    def _check_parents_present(self):
347
347
 
348
348
        Returned as a map from text version to inventory entry.
349
349
 
350
 
        This is a set containing the file versions in all parents
 
350
        This is a map containing the file versions in all parents
351
351
        revisions containing the file.  If the file is new, the set
352
352
        will be empty."""
353
353
        r = {}
354
 
        for tree in self.parent_trees:
355
 
            if file_id in tree.inventory:
356
 
                ie = tree.inventory[file_id]
 
354
        for inv in self.parent_invs:
 
355
            if file_id in inv:
 
356
                ie = inv[file_id]
357
357
                assert ie.file_id == file_id
358
358
                if ie.revision in r:
359
359
                    assert r[ie.revision] == ie