/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-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
129
129
            ppath = ptree.id2path(file_id)
130
130
        except errors.NoSuchId:
131
131
            continue
132
 
        pkind = ptree.kind(ppath, file_id)
 
132
        pkind = ptree.kind(ppath)
133
133
        if (pkind == ie.kind and
134
 
            ((pkind == "symlink" and ptree.get_symlink_target(ppath, file_id) == ie.symlink_target) or
135
 
             (pkind == "file" and ptree.get_file_sha1(ppath, file_id) == ie.text_sha1 and
136
 
                ptree.is_executable(ppath, file_id) == ie.executable))):
 
134
            ((pkind == "symlink" and ptree.get_symlink_target(ppath) == ie.symlink_target) or
 
135
             (pkind == "file" and ptree.get_file_sha1(ppath) == ie.text_sha1 and
 
136
                ptree.is_executable(ppath) == ie.executable))):
137
137
            # found a revision in one of the parents to use
138
 
            ie.revision = ptree.get_file_revision(ppath, file_id)
 
138
            ie.revision = ptree.get_file_revision(ppath)
139
139
            break
140
 
        parent_key = (file_id, ptree.get_file_revision(ppath, file_id))
 
140
        parent_key = (file_id, ptree.get_file_revision(ppath))
141
141
        if not parent_key in parent_keys:
142
142
            parent_keys.append(parent_key)
143
143
    if ie.revision is None: