← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-15 08:12:33 UTC
  • mfrom: (5783.2.5 2.4-merge-faster-759091)
  • Revision ID: pqm@pqm.ubuntu.com-20110415081233-mqfd5six3sqmi1sn
(jameinel) Make 'bzr merge' much faster by not walking unchanged entries.
 (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
3039
3039
                        file_id = tt.final_file_id(trans_id)
3040
3040
                        if file_id is None:
3041
3041
                            file_id = tt.inactive_file_id(trans_id)
3042
 
                        entry = path_tree.inventory[file_id]
 
3042
                        _, entry = path_tree.iter_entries_by_dir(
 
3043
                            [file_id]).next()
3043
3044
                        # special-case the other tree root (move its
3044
3045
                        # children to current root)
3045
3046
                        if entry.parent_id is None: