← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

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):
1127
1130
            if file_id in to_paths:
1128
1131
                # already returned
1129
1132
                continue
1130
 
            if file_id not in self.target.all_file_ids():
 
1133
            if not self.target.has_id(file_id):
1131
1134
                # common case - paths we have not emitted are not present in
1132
1135
                # target.
1133
1136
                to_path = None