/breezy/3.1

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/3.1

« back to all changes in this revision

Viewing changes to breezy/git/object_store.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-09 17:46:22 UTC
  • mfrom: (7357.1.8 intertree-find-target-path)
  • Revision ID: breezy.the.bot@gmail.com-20200209174622-7ucfq64y2r6v80wv
Use InterTree object when looking for renames.

Merged from https://code.launchpad.net/~jelmer/brz/intertree-renames/+merge/378777

Show diffs side-by-side

added added

removed removed

Lines of Context:
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":