← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Aaron Bentley
  • Date: 2008-07-23 21:59:19 UTC
  • mto: (3363.16.1 __contains__)
  • mto: This revision was merged to the branch mainline in revision 3726.
  • Revision ID: aaron@aaronbentley.com-20080723215919-me5vfhbtap1u2eei
Get iter_changes running to completion

Show diffs side-by-side

added added

removed removed

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