← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Martin Pool
  • Date: 2010-04-01 04:41:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5128.
  • Revision ID: mbp@sourcefrog.net-20100401044118-shyctqc02ob08ngz
ignore .testrepository

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
39
40
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
40
41
from bzrlib.trace import note
41
42
 
520
521
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
521
522
                self._iter_parent_trees()]
522
523
            vf.add_lines((file_id, last_revision), parent_keys,
523
 
                         self.get_file_lines(file_id))
 
524
                         self.get_file(file_id).readlines())
524
525
            repo = self.branch.repository
525
526
            base_vf = repo.texts
526
527
        else:
582
583
            yield child.file_id
583
584
 
584
585
    def lock_read(self):
585
 
        """Lock this tree for multiple read only operations.
586
 
        
587
 
        :return: A bzrlib.lock.LogicalLockResult.
588
 
        """
589
586
        pass
590
587
 
591
588
    def revision_tree(self, revision_id):
1130
1127
            if file_id in to_paths:
1131
1128
                # already returned
1132
1129
                continue
1133
 
            if not self.target.has_id(file_id):
 
1130
            if file_id not in self.target.all_file_ids():
1134
1131
                # common case - paths we have not emitted are not present in
1135
1132
                # target.
1136
1133
                to_path = None