~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
1510
1510
        return self._repository.weave_store.get_weave(file_id,
1511
1511
                self._repository.get_transaction())
1512
1512
 
1513
 
    def get_file(self, file_id):
 
1513
    def get_file(self, file_id, path=None):
1514
1514
        return StringIO(self.get_file_text(file_id))
1515
1515
 
1516
1516
    def get_file_lines(self, file_id):