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

  • Committer: Jelmer Vernooij
  • Date: 2020-02-25 00:38:06 UTC
  • mfrom: (7490.3.5 work)
  • mto: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200225003806-7i1vt6f65ywyxqfy
Merge 3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
55
55
from ..bzr.testament import (
56
56
    StrictTestament3,
57
57
    )
58
 
from ..tree import find_previous_path
 
58
from ..tree import InterTree
59
59
from ..tsort import (
60
60
    topo_sort,
61
61
    )
126
126
    # Check what revision we should store
127
127
    parent_keys = []
128
128
    for ptree in parent_bzr_trees:
 
129
        intertree = InterTree.get(ptree, base_bzr_tree)
129
130
        try:
130
 
            ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, recurse='none')
 
131
            ppath = intertree.find_source_paths(decoded_path, recurse='none')
131
132
        except errors.NoSuchFile:
132
133
            continue
133
134
        if ppath is None: