← 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: 2006-11-28 06:26:25 UTC
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061128062625-qht3d2a686fzo7xc
Use inventory for comparison, to avoid unwanted stats

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
466
466
        Iteration is done in parent-to-child order, relative to the to_tree.
467
467
        """
468
468
        to_paths = {}
469
 
        from_entries_by_dir = list(from_tree.iter_entries_by_dir())
 
469
        from_entries_by_dir = list(from_tree.inventory.iter_entries_by_dir())
470
470
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
471
 
        to_entries_by_dir = list(to_tree.iter_entries_by_dir())
 
471
        to_entries_by_dir = list(to_tree.inventory.iter_entries_by_dir())
472
472
        if specific_file_ids is not None:
473
473
            specific_file_ids = set(specific_file_ids)
474
474
            num_entries = len(specific_file_ids)