← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
36
36
from bzrlib.inventory import InventoryFile
37
37
from bzrlib.inter import InterObject
38
38
from bzrlib.osutils import fingerprint_file
39
 
import bzrlib.revision
40
39
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
41
40
from bzrlib.trace import note
42
41
 
521
520
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
522
521
                self._iter_parent_trees()]
523
522
            vf.add_lines((file_id, last_revision), parent_keys,
524
 
                         self.get_file(file_id).readlines())
 
523
                         self.get_file_lines(file_id))
525
524
            repo = self.branch.repository
526
525
            base_vf = repo.texts
527
526
        else:
583
582
            yield child.file_id
584
583
 
585
584
    def lock_read(self):
 
585
        """Lock this tree for multiple read only operations.
 
586
        
 
587
        :return: A bzrlib.lock.LogicalLockResult.
 
588
        """
586
589
        pass
587
590
 
588
591
    def revision_tree(self, revision_id):