← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Martin
  • Date: 2011-03-20 18:58:43 UTC
  • mto: This revision was merged to the branch mainline in revision 5731.
  • Revision ID: gzlist@googlemail.com-20110320185843-qn8g96slbc33yw9h
Non-code fixes noticed looking at full diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
520
520
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
521
521
                self._iter_parent_trees()]
522
522
            vf.add_lines((file_id, last_revision), parent_keys,
523
 
                         self.get_file(file_id).readlines())
 
523
                         self.get_file_lines(file_id))
524
524
            repo = self.branch.repository
525
525
            base_vf = repo.texts
526
526
        else:
582
582
            yield child.file_id
583
583
 
584
584
    def lock_read(self):
 
585
        """Lock this tree for multiple read only operations.
 
586
        
 
587
        :return: A bzrlib.lock.LogicalLockResult.
 
588
        """
585
589
        pass
586
590
 
587
591
    def revision_tree(self, revision_id):
774
778
    return 'wtf?'
775
779
 
776
780
 
777
 
@deprecated_function(deprecated_in((1, 9, 0)))
778
 
def find_renames(old_inv, new_inv):
779
 
    for file_id in old_inv:
780
 
        if file_id not in new_inv:
781
 
            continue
782
 
        old_name = old_inv.id2path(file_id)
783
 
        new_name = new_inv.id2path(file_id)
784
 
        if old_name != new_name:
785
 
            yield (old_name, new_name)
786
 
 
787
 
 
788
781
def find_ids_across_trees(filenames, trees, require_versioned=True):
789
782
    """Find the ids corresponding to specified filenames.
790
783
 
1126
1119
            if file_id in to_paths:
1127
1120
                # already returned
1128
1121
                continue
1129
 
            if file_id not in self.target.all_file_ids():
 
1122
            if not self.target.has_id(file_id):
1130
1123
                # common case - paths we have not emitted are not present in
1131
1124
                # target.
1132
1125
                to_path = None