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

  • Committer: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
66
66
    )
67
67
from .progress import ProgressPhase
68
68
from .tree import (
69
 
    find_previous_path,
 
69
    InterTree,
70
70
    TreeChange,
71
71
    )
72
72
 
2956
2956
                        if basis_tree is None:
2957
2957
                            basis_tree = working_tree.basis_tree()
2958
2958
                            basis_tree.lock_read()
2959
 
                        basis_path = find_previous_path(
2960
 
                            working_tree, basis_tree, wt_path)
 
2959
                        basis_inter = InterTree.get(basis_tree, working_tree)
 
2960
                        basis_path = basis_inter.find_source_path(wt_path)
2961
2961
                        if basis_path is None:
2962
2962
                            if target_kind is None and not target_versioned:
2963
2963
                                keep_content = True
2996
2996
                        basis_tree = working_tree.basis_tree()
2997
2997
                        basis_tree.lock_read()
2998
2998
                    new_sha1 = target_tree.get_file_sha1(target_path)
2999
 
                    basis_path = find_previous_path(target_tree, basis_tree, target_path)
 
2999
                    basis_inter = InterTree.get(basis_tree, target_tree)
 
3000
                    basis_path = basis_inter.find_source_path(target_path)
3000
3001
                    if (basis_path is not None and
3001
3002
                            new_sha1 == basis_tree.get_file_sha1(basis_path)):
3002
3003
                        # If the new contents of the file match what is in basis,