/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-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/git/fetch.py
54
54
from ..bzr.testament import (
55
55
    StrictTestament3,
56
56
    )
57
 
from ..tree import find_previous_path
 
57
from ..tree import InterTree
58
58
from ..tsort import (
59
59
    topo_sort,
60
60
    )
125
125
    # Check what revision we should store
126
126
    parent_keys = []
127
127
    for ptree in parent_bzr_trees:
128
 
        ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, file_id, recurse='none')
 
128
        intertree = InterTree.get(ptree, base_bzr_tree)
 
129
        try:
 
130
            ppath = intertree.find_source_paths(decoded_path, recurse='none')
 
131
        except errors.NoSuchFile:
 
132
            continue
129
133
        if ppath is None:
130
134
            continue
131
135
        pkind = ptree.kind(ppath)