/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-08 23:46:02 UTC
  • mfrom: (7357.1.7 intertree-find-target-path)
  • Revision ID: breezy.the.bot@gmail.com-20200208234602-59w6n0pyiewl99vi
Move the logic behind find_previous_path onto InterTree, so it can be overriden.

Merged from https://code.launchpad.net/~jelmer/brz/intertree-find-target-path/+merge/369202

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
126
126
    # Check what revision we should store
127
127
    parent_keys = []
128
128
    for ptree in parent_bzr_trees:
129
 
        ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, file_id, recurse='none')
 
129
        try:
 
130
            ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, recurse='none')
 
131
        except errors.NoSuchFile:
 
132
            continue
130
133
        if ppath is None:
131
134
            continue
132
135
        pkind = ptree.kind(ppath)