~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-29 21:39:27 UTC
  • mfrom: (3806 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3814.
  • Revision ID: andrew.bennetts@canonical.com-20081029213927-w349uqh8ya8293xv
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1625
1625
    def get_file(self, file_id, path=None):
1626
1626
        return StringIO(self.get_file_text(file_id))
1627
1627
 
1628
 
    def get_file_lines(self, file_id):
1629
 
        return osutils.split_lines(self.get_file_text(file_id))
1630
 
 
1631
1628
    def get_file_size(self, file_id):
1632
1629
        """See Tree.get_file_size"""
1633
1630
        return self.inventory[file_id].text_size
1634
1631
 
1635
 
    def get_file_text(self, file_id):
 
1632
    def get_file_text(self, file_id, path=None):
1636
1633
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
1637
1634
 
1638
1635
    def get_reference_revision(self, file_id, path=None):