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

  • Committer: Rory Yorke
  • Date: 2010-10-20 14:38:53 UTC
  • mto: This revision was merged to the branch mainline in revision 5519.
  • Revision ID: rory.yorke@gmail.com-20101020143853-9kfd2ldcjfroh8jw
Show missing files in bzr status (bug 134168).

"bzr status" will now show missing files, that is, those added with "bzr
add" and then removed by non bzr means (e.g., rm).

Blackbox tests were added for this case, and tests were also added to
test_delta, since the implementation change is in bzrlib.delta.

Might also affect bug 189709.

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