/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/git/object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-09 17:10:01 UTC
  • mto: This revision was merged to the branch mainline in revision 7489.
  • Revision ID: jelmer@jelmer.uk-20200209171001-0h0snwtiu51f1sjf
Remove the InterTree object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
42
42
    osutils,
43
43
    ui,
44
44
    )
45
 
from ..tree import find_previous_path
46
45
from ..lock import LogicalLockResult
47
46
from ..revision import (
48
47
    NULL_REVISION,
49
48
    )
50
49
from ..sixish import viewitems
 
50
from ..tree import InterTree
51
51
from ..bzr.testament import (
52
52
    StrictTestament3,
53
53
    )
231
231
 
232
232
    def find_unchanged_parent_ie(path, kind, other, parent_trees):
233
233
        for ptree in parent_trees:
234
 
            ppath = find_previous_path(tree, ptree, path)
 
234
            intertree = InterTree.get(ptree, tree)
 
235
            ppath = intertree.find_source_path(path)
235
236
            if ppath is not None:
236
237
                pkind = ptree.kind(ppath)
237
238
                if kind == "file":