/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/workingtree_4.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
69
69
from bzrlib import symbol_versioning
70
70
from bzrlib.decorators import needs_read_lock, needs_write_lock
71
71
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
72
 
from bzrlib.lockable_files import LockableFiles, TransportLock
73
 
from bzrlib.lockdir import LockDir
74
72
import bzrlib.mutabletree
75
73
from bzrlib.mutabletree import needs_tree_write_lock
76
74
from bzrlib.osutils import (
1625
1623
    def get_file(self, file_id, path=None):
1626
1624
        return StringIO(self.get_file_text(file_id))
1627
1625
 
1628
 
    def get_file_lines(self, file_id):
1629
 
        return osutils.split_lines(self.get_file_text(file_id))
1630
 
 
1631
1626
    def get_file_size(self, file_id):
1632
1627
        """See Tree.get_file_size"""
1633
1628
        return self.inventory[file_id].text_size
1634
1629
 
1635
 
    def get_file_text(self, file_id):
 
1630
    def get_file_text(self, file_id, path=None):
1636
1631
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
1637
1632
 
1638
1633
    def get_reference_revision(self, file_id, path=None):