/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: John Arbash Meinel
  • Date: 2008-09-26 22:08:38 UTC
  • mfrom: (3744 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3745.
  • Revision ID: john@arbash-meinel.com-20080926220838-e05btynnn08m3qf5
Merge bzr.dev, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
132
132
    def has_id(self, file_id):
133
133
        return self.inventory.has_id(file_id)
134
134
 
135
 
    __contains__ = has_id
 
135
    def __contains__(self, file_id):
 
136
        return self.has_id(file_id)
136
137
 
137
138
    def has_or_had_id(self, file_id):
138
139
        if file_id == self.inventory.root.file_id:
835
836
        else:
836
837
            all_unversioned = deque()
837
838
        to_paths = {}
838
 
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
 
839
        from_entries_by_dir = list(self.source.iter_entries_by_dir(
839
840
            specific_file_ids=specific_file_ids))
840
841
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
841
 
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
 
842
        to_entries_by_dir = list(self.target.iter_entries_by_dir(
842
843
            specific_file_ids=specific_file_ids))
843
844
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
844
845
        entry_count = 0
936
937
            if file_id in to_paths:
937
938
                # already returned
938
939
                continue
939
 
            if not file_id in self.target.inventory:
 
940
            if not file_id in self.target.all_file_ids():
940
941
                # common case - paths we have not emitted are not present in
941
942
                # target.
942
943
                to_path = None