← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
36
36
        self._revision_id = revision_id
37
37
        self._rules_searcher = None
38
38
 
 
39
    def has_versioned_directories(self):
 
40
        """See `Tree.has_versioned_directories`."""
 
41
        return self._repository._format.supports_versioned_directories
 
42
 
39
43
    def supports_tree_reference(self):
40
44
        return getattr(self._repository._format, "supports_tree_reference",
41
45
            False)
61
65
        raise NotImplementedError(self.get_file_revision)
62
66
 
63
67
    def get_file_text(self, file_id, path=None):
64
 
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
65
 
        return ''.join(content)
 
68
        for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
 
69
            ret = "".join(content)
 
70
        return ret
66
71
 
67
72
    def get_file(self, file_id, path=None):
68
73
        return StringIO(self.get_file_text(file_id))
211
216
    def iter_files_bytes(self, desired_files):
212
217
        """See Tree.iter_files_bytes.
213
218
 
214
 
        This version is implemented on top of Repository.extract_files_bytes"""
 
219
        This version is implemented on top of Repository.iter_files_bytes"""
215
220
        repo_desired_files = [(f, self.get_file_revision(f), i)
216
221
                              for f, i in desired_files]
217
222
        try:
218
223
            for result in self._repository.iter_files_bytes(repo_desired_files):
219
224
                yield result
220
225
        except errors.RevisionNotPresent, e:
221
 
            raise errors.NoSuchFile(e.revision_id)
 
226
            raise errors.NoSuchFile(e.file_id)
222
227
 
223
228
    def annotate_iter(self, file_id,
224
229
                      default_revision=revision.CURRENT_REVISION):