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

  • Committer: John Arbash Meinel
  • Date: 2011-04-14 17:29:13 UTC
  • mto: This revision was merged to the branch mainline in revision 5786.
  • Revision ID: john@arbash-meinel.com-20110414172913-gjqy6upjx4az2grq
Transform.conflict_pass can avoid accessing tree.inventory.

It used to pass because all parent dirs were already noted to the Transform,
however now only changed files are noted (and that dir wasn't changed, just
the child). However, we want to avoid tree.inventory anyway, since
PreviewTree doesn't implement it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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([file_id]).next()
3043
3043
                        # special-case the other tree root (move its
3044
3044
                        # children to current root)
3045
3045
                        if entry.parent_id is None: