~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge down-thread (including bzr.dev)

Show diffs side-by-side

added added

removed removed

Lines of Context:
424
424
        return osutils.lexists(self.abspath(filename))
425
425
 
426
426
    def get_file(self, file_id, path=None):
 
427
        return self.get_file_with_stat(file_id, path)[0]
 
428
 
 
429
    def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
 
430
        """See MutableTree.get_file_with_stat."""
427
431
        if path is None:
428
432
            path = self.id2path(file_id)
429
 
        return self.get_file_byname(path)
 
433
        file_obj = self.get_file_byname(path)
 
434
        return (file_obj, _fstat(file_obj.fileno()))
430
435
 
431
436
    def get_file_text(self, file_id):
432
437
        return self.get_file(file_id).read()