/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: 2018-09-11 03:12:02 UTC
  • mfrom: (7101 work)
  • mto: This revision was merged to the branch mainline in revision 7102.
  • Revision ID: jelmer@jelmer.uk-20180911031202-p2wpqy0xzx7wjmid
Merge trunk.

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