/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-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
145
145
            ppath = ptree.id2path(file_id)
146
146
        except errors.NoSuchId:
147
147
            continue
148
 
        pkind = ptree.kind(ppath, file_id)
 
148
        pkind = ptree.kind(ppath)
149
149
        if (pkind == ie.kind and
150
 
            ((pkind == "symlink" and ptree.get_symlink_target(ppath, file_id) == ie.symlink_target) or
151
 
             (pkind == "file" and ptree.get_file_sha1(ppath, file_id) == ie.text_sha1 and
152
 
                ptree.is_executable(ppath, file_id) == ie.executable))):
 
150
            ((pkind == "symlink" and ptree.get_symlink_target(ppath) == ie.symlink_target) or
 
151
             (pkind == "file" and ptree.get_file_sha1(ppath) == ie.text_sha1 and
 
152
                ptree.is_executable(ppath) == ie.executable))):
153
153
            # found a revision in one of the parents to use
154
 
            ie.revision = ptree.get_file_revision(ppath, file_id)
 
154
            ie.revision = ptree.get_file_revision(ppath)
155
155
            break
156
 
        parent_key = (file_id, ptree.get_file_revision(ppath, file_id))
 
156
        parent_key = (file_id, ptree.get_file_revision(ppath))
157
157
        if not parent_key in parent_keys:
158
158
            parent_keys.append(parent_key)
159
159
    if ie.revision is None: