~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-26 16:35:00 UTC
  • mfrom: (4208 +trunk)
  • mto: (3735.40.9 vilajam)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: john@arbash-meinel.com-20090326163500-os7lvdpsdxnxstd0
Merge bzr.dev 4208.

This brings in some more smart-server improvements, 
as well as the iter_files_bytes as chunked, and 
multi-file and directory logging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1719
1719
        return self.inventory[file_id].text_size
1720
1720
 
1721
1721
    def get_file_text(self, file_id, path=None):
1722
 
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
 
1722
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
 
1723
        return ''.join(content)
1723
1724
 
1724
1725
    def get_reference_revision(self, file_id, path=None):
1725
1726
        return self.inventory[file_id].reference_revision