← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-19 12:54:46 UTC
  • mfrom: (5793.2.6 revisiontree-get-revision)
  • Revision ID: pqm@pqm.ubuntu.com-20110419125446-s16r0ck8t1ig6u7n
(jelmer) Add RevisionTree.get_file_revision,
 replacing an existing static method on Tree. 
 This should also make it unnecessary to access the inventory in a couple
 more cases. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2865
2865
        for revision, tree in parent_trees.iteritems():
2866
2866
            if ie.file_id not in tree:
2867
2867
                continue
2868
 
            parent_id = tree.inventory[ie.file_id].revision
 
2868
            parent_id = tree.get_file_revision(ie.file_id)
2869
2869
            if parent_id in text_parents:
2870
2870
                continue
2871
2871
            text_parents.append((ie.file_id, parent_id))