/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:12:36 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120130141236-66k8qj1he6q2nq3r
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
16
16
 
17
17
"""RevisionTree - a Tree implementation backed by repository data for a revision."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from cStringIO import StringIO
20
22
 
21
23
from bzrlib import (
65
67
        raise NotImplementedError(self.get_file_revision)
66
68
 
67
69
    def get_file_text(self, file_id, path=None):
68
 
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
69
 
        return ''.join(content)
 
70
        for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
 
71
            ret = "".join(content)
 
72
        return ret
70
73
 
71
74
    def get_file(self, file_id, path=None):
72
75
        return StringIO(self.get_file_text(file_id))
215
218
    def iter_files_bytes(self, desired_files):
216
219
        """See Tree.iter_files_bytes.
217
220
 
218
 
        This version is implemented on top of Repository.extract_files_bytes"""
 
221
        This version is implemented on top of Repository.iter_files_bytes"""
219
222
        repo_desired_files = [(f, self.get_file_revision(f), i)
220
223
                              for f, i in desired_files]
221
224
        try:
222
225
            for result in self._repository.iter_files_bytes(repo_desired_files):
223
226
                yield result
224
227
        except errors.RevisionNotPresent, e:
225
 
            raise errors.NoSuchFile(e.revision_id)
 
228
            raise errors.NoSuchFile(e.file_id)
226
229
 
227
230
    def annotate_iter(self, file_id,
228
231
                      default_revision=revision.CURRENT_REVISION):