/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: 2018-08-21 23:41:26 UTC
  • mfrom: (7069.1.3 brz-git-fetch)
  • Revision ID: breezy.the.bot@gmail.com-20180821234126-e0rcjijosvj5znlu
Avoid use of find_related_paths_across_trees.

Merged from https://code.launchpad.net/~jelmer/brz/brz-git-fetch/+merge/353527

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
142
142
    parent_keys = []
143
143
    for ptree in parent_bzr_trees:
144
144
        try:
145
 
            ppaths = base_bzr_tree.find_related_paths_across_trees([decoded_path], trees=[ptree])
146
 
        except errors.PathsNotVersionedError:
 
145
            ppath = ptree.id2path(file_id)
 
146
        except errors.NoSuchId:
147
147
            continue
148
 
        ppath = ppaths.pop()
149
148
        pkind = ptree.kind(ppath, file_id)
150
149
        if (pkind == ie.kind and
151
150
            ((pkind == "symlink" and ptree.get_symlink_target(ppath, file_id) == ie.symlink_target) or