← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-19 10:42:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5806.
  • Revision ID: jelmer@samba.org-20110419104259-g9exlcp1f5jdu3ci
Move Inventory._get_mutable_inventory -> mutable_inventory_from_tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
433
433
            except errors.NoSuchRevisionInTree:
434
434
                yield self.repository.revision_tree(revision_id)
435
435
 
 
436
    @staticmethod
 
437
    def _file_revision(revision_tree, file_id):
 
438
        """Determine the revision associated with a file in a given tree."""
 
439
        # FIXME: Shouldn't this be a RevisionTree method?
 
440
        revision_tree.lock_read()
 
441
        try:
 
442
            return revision_tree.inventory[file_id].revision
 
443
        finally:
 
444
            revision_tree.unlock()
 
445
 
436
446
    def _get_file_revision(self, file_id, vf, tree_revision):
437
447
        """Ensure that file_id, tree_revision is in vf to plan the merge."""
438
448
 
439
449
        if getattr(self, '_repository', None) is None:
440
450
            last_revision = tree_revision
441
 
            parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
 
451
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
442
452
                self._iter_parent_trees()]
443
453
            vf.add_lines((file_id, last_revision), parent_keys,
444
454
                         self.get_file_lines(file_id))
445
455
            repo = self.branch.repository
446
456
            base_vf = repo.texts
447
457
        else:
448
 
            last_revision = self.get_file_revision(file_id)
 
458
            last_revision = self._file_revision(self, file_id)
449
459
            base_vf = self._repository.texts
450
460
        if base_vf not in vf.fallback_versionedfiles:
451
461
            vf.fallback_versionedfiles.append(base_vf)