This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5958

remotefilelog: remove strkwargs()
ClosedPublic

Authored by indygreg on Feb 13 2019, 7:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3d5543599df8: remotefilelog: remove strkwargs()
rHG4eeed5eac0f4: remotefilelog: remove strkwargs()
Summary

The previous commit activated previously unused code paths on
Python 3 and revealed that we were calling strkwargs() on a dict
that already had str keys. The only caller of _forceprefetch()
is _adjustlinknode() a few lines up and the static commonlogkwargs
dict features str keys.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 13 2019, 7:38 PM
pulkit accepted this revision.Feb 14 2019, 7:51 AM
Closed by commit rHG4eeed5eac0f4: remotefilelog: remove strkwargs() (authored by indygreg). · Explain WhyFeb 14 2019, 8:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14085

hgext/remotefilelog/remotefilectx.py

logmsg = 'remotefilelog prefetching not found' logmsg = 'remotefilelog prefetching not found'
return None return None
except Exception as e: except Exception as e:
logmsg = 'remotefilelog prefetching failed (%s)' % e logmsg = 'remotefilelog prefetching failed (%s)' % e
return None return None
finally: finally:
elapsed = time.time() - start elapsed = time.time() - start
repo.ui.log('linkrevfixup', logmsg + '\n', elapsed=elapsed * 1000, repo.ui.log('linkrevfixup', logmsg + '\n', elapsed=elapsed * 1000,
**pycompat.strkwargs(commonlogkwargs)) **commonlogkwargs)
def _verifylinknode(self, revs, linknode): def _verifylinknode(self, revs, linknode):
""" """
Check if a linknode is correct one for the current history. Check if a linknode is correct one for the current history.
That is, return True if the linkrev is the ancestor of any of the That is, return True if the linkrev is the ancestor of any of the
passed in revs, otherwise return False. passed in revs, otherwise return False.