← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.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/revisiontree.py
56
56
        """Return the revision id associated with this tree."""
57
57
        return self._revision_id
58
58
 
59
 
    def get_file_revision(self, file_id, path=None):
60
 
        """Return the revision id in which a file was last changed."""
61
 
        raise NotImplementedError(self.get_file_revision)
62
 
 
63
59
    def get_file_text(self, file_id, path=None):
64
60
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
65
61
        return ''.join(content)
112
108
            return ie.text_sha1
113
109
        return None
114
110
 
115
 
    def get_file_revision(self, file_id, path=None):
116
 
        ie = self._inventory[file_id]
117
 
        return ie.revision
118
 
 
119
111
    def is_executable(self, file_id, path=None):
120
112
        ie = self._inventory[file_id]
121
113
        if ie.kind != "file":
216
208
        """See Tree.iter_files_bytes.
217
209
 
218
210
        This version is implemented on top of Repository.extract_files_bytes"""
219
 
        repo_desired_files = [(f, self.get_file_revision(f), i)
 
211
        repo_desired_files = [(f, self.inventory[f].revision, i)
220
212
                              for f, i in desired_files]
221
213
        try:
222
214
            for result in self._repository.iter_files_bytes(repo_desired_files):
227
219
    def annotate_iter(self, file_id,
228
220
                      default_revision=revision.CURRENT_REVISION):
229
221
        """See Tree.annotate_iter"""
230
 
        text_key = (file_id, self.get_file_revision(file_id))
 
222
        text_key = (file_id, self.inventory[file_id].revision)
231
223
        annotator = self._repository.texts.get_annotator()
232
224
        annotations = annotator.annotate_flat(text_key)
233
225
        return [(key[-1], line) for key, line in annotations]