This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2420

py3: fix handling of keyword arguments at more places
ClosedPublic

Authored by pulkit on Feb 24 2018, 6:19 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG7b86aa31b004: py3: fix handling of keyword arguments at more places
Summary

The keys of keyword arguments of Python 3 should be str, which is why we need to
prevent getting the b'' prefix added by the transformer or convert keys to str
using pycompat.strkwargs()

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 24 2018, 6:19 AM
yuja requested changes to this revision.Feb 24 2018, 7:58 AM
yuja added a subscriber: yuja.
yuja added inline comments.
hgext/rebase.py
597

strkwargs() ?

This revision now requires changes to proceed.Feb 24 2018, 7:58 AM
pulkit updated this revision to Diff 6054.Feb 24 2018, 8:51 AM
yuja accepted this revision.Feb 24 2018, 8:24 PM
This revision is now accepted and ready to land.Feb 24 2018, 8:24 PM
Closed by commit rHG7b86aa31b004: py3: fix handling of keyword arguments at more places (authored by pulkit). · Explain WhyFeb 24 2018, 8:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6054

hgext/largefiles/overrides.py

del repo.firstpulled del repo.firstpulled
ui.status(_("%d largefiles cached\n") % numcached) ui.status(_("%d largefiles cached\n") % numcached)
return result return result
def overridepush(orig, ui, repo, *args, **kwargs): def overridepush(orig, ui, repo, *args, **kwargs):
"""Override push command and store --lfrev parameters in opargs""" """Override push command and store --lfrev parameters in opargs"""
lfrevs = kwargs.pop(r'lfrev', None) lfrevs = kwargs.pop(r'lfrev', None)
if lfrevs: if lfrevs:
opargs = kwargs.setdefault('opargs', {}) opargs = kwargs.setdefault(r'opargs', {})
opargs['lfrevs'] = scmutil.revrange(repo, lfrevs) opargs['lfrevs'] = scmutil.revrange(repo, lfrevs)
return orig(ui, repo, *args, **kwargs) return orig(ui, repo, *args, **kwargs)
def exchangepushoperation(orig, *args, **kwargs): def exchangepushoperation(orig, *args, **kwargs):
"""Override pushoperation constructor and store lfrevs parameter""" """Override pushoperation constructor and store lfrevs parameter"""
lfrevs = kwargs.pop(r'lfrevs', None) lfrevs = kwargs.pop(r'lfrevs', None)
pushop = orig(*args, **kwargs) pushop = orig(*args, **kwargs)
pushop.lfrevs = lfrevs pushop.lfrevs = lfrevs

hgext/lfs/__init__.py

repo.svfs.options['lfstrack'] = _trackedmatcher(self) repo.svfs.options['lfstrack'] = _trackedmatcher(self)
return super(lfsrepo, self).commitctx(ctx, error) return super(lfsrepo, self).commitctx(ctx, error)
repo.__class__ = lfsrepo repo.__class__ = lfsrepo
if 'lfs' not in repo.requirements: if 'lfs' not in repo.requirements:
def checkrequireslfs(ui, repo, **kwargs): def checkrequireslfs(ui, repo, **kwargs):
if 'lfs' not in repo.requirements: if 'lfs' not in repo.requirements:
last = kwargs.get('node_last') last = kwargs.get(r'node_last')
_bin = node.bin _bin = node.bin
if last: if last:
s = repo.set('%n:%n', _bin(kwargs['node']), _bin(last)) s = repo.set('%n:%n', _bin(kwargs[r'node']), _bin(last))
else: else:
s = repo.set('%n', _bin(kwargs['node'])) s = repo.set('%n', _bin(kwargs[r'node']))
for ctx in s: for ctx in s:
# TODO: is there a way to just walk the files in the commit? # TODO: is there a way to just walk the files in the commit?
if any(ctx[f].islfs() for f in ctx.files() if f in ctx): if any(ctx[f].islfs() for f in ctx.files() if f in ctx):
repo.requirements.add('lfs') repo.requirements.add('lfs')
repo._writerequirements() repo._writerequirements()
repo.prepushoutgoinghooks.add('lfs', wrapper.prepush) repo.prepushoutgoinghooks.add('lfs', wrapper.prepush)
break break

hgext/rebase.py

keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state: for oldrev in self.state:
self.state[oldrev] = newrev self.state[oldrev] = newrev
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, **opts) updatemq(repo, self.state, self.skipped,
**pycompat.strkwargs(opts))
yujaUnsubmitted
Not Done

strkwargs() ?

yuja: strkwargs() ?
# restore original working directory # restore original working directory
# (we do this before stripping) # (we do this before stripping)
newwd = self.state.get(self.originalwd, self.originalwd) newwd = self.state.get(self.originalwd, self.originalwd)
if newwd < 0: if newwd < 0:
# original directory is a parent of rebase set root or ignored # original directory is a parent of rebase set root or ignored
newwd = self.originalwd newwd = self.originalwd
if (newwd not in [c.rev() for c in repo[None].parents()] and if (newwd not in [c.rev() for c in repo[None].parents()] and

hgext/split.py

from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
commands, commands,
error, error,
hg, hg,
obsolete, obsolete,
phases, phases,
pycompat,
registrar, registrar,
revsetlang, revsetlang,
scmutil, scmutil,
) )
# allow people to use split without explicitly enabling rebase extension # allow people to use split without explicitly enabling rebase extension
from . import ( from . import (
rebase, rebase,
else: else:
header = _('HG: Splitting %s. Write commit message for the ' header = _('HG: Splitting %s. Write commit message for the '
'first split changeset.\n') % short(ctx.node()) 'first split changeset.\n') % short(ctx.node())
opts.update({ opts.update({
'edit': True, 'edit': True,
'interactive': True, 'interactive': True,
'message': header + ctx.description(), 'message': header + ctx.description(),
}) })
commands.commit(ui, repo, **opts) commands.commit(ui, repo, **pycompat.strkwargs(opts))
newctx = repo['.'] newctx = repo['.']
committed.append(newctx) committed.append(newctx)
if not committed: if not committed:
raise error.Abort(_('cannot split an empty revision')) raise error.Abort(_('cannot split an empty revision'))
scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]}, scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]},
operation='split') operation='split')
return committed[-1] return committed[-1]
def dorebase(ui, repo, src, dest): def dorebase(ui, repo, src, dest):
rebase.rebase(ui, repo, rev=[revsetlang.formatspec('%ld', src)], rebase.rebase(ui, repo, rev=[revsetlang.formatspec('%ld', src)],
dest=revsetlang.formatspec('%d', dest)) dest=revsetlang.formatspec('%d', dest))

mercurial/localrepo.py

return util.hooks() return util.hooks()
def pushkey(self, namespace, key, old, new): def pushkey(self, namespace, key, old, new):
try: try:
tr = self.currenttransaction() tr = self.currenttransaction()
hookargs = {} hookargs = {}
if tr is not None: if tr is not None:
hookargs.update(tr.hookargs) hookargs.update(tr.hookargs)
hookargs['namespace'] = namespace hookargs = pycompat.strkwargs(hookargs)
hookargs['key'] = key hookargs[r'namespace'] = namespace
hookargs['old'] = old hookargs[r'key'] = key
hookargs['new'] = new hookargs[r'old'] = old
hookargs[r'new'] = new
self.hook('prepushkey', throw=True, **hookargs) self.hook('prepushkey', throw=True, **hookargs)
except error.HookAbort as exc: except error.HookAbort as exc:
self.ui.write_err(_("pushkey-abort: %s\n") % exc) self.ui.write_err(_("pushkey-abort: %s\n") % exc)
if exc.hint: if exc.hint:
self.ui.write_err(_("(%s)\n") % exc.hint) self.ui.write_err(_("(%s)\n") % exc.hint)
return False return False
self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key)) self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key))
ret = pushkey.push(self, namespace, key, old, new) ret = pushkey.push(self, namespace, key, old, new)

mercurial/profiling.py

if profformat == 'chrome': if profformat == 'chrome':
showmin = ui.configwith(fraction, 'profiling', 'showmin', 0.005) showmin = ui.configwith(fraction, 'profiling', 'showmin', 0.005)
showmax = ui.configwith(fraction, 'profiling', 'showmax') showmax = ui.configwith(fraction, 'profiling', 'showmax')
kwargs.update(minthreshold=showmin, maxthreshold=showmax) kwargs.update(minthreshold=showmin, maxthreshold=showmax)
elif profformat == 'hotpath': elif profformat == 'hotpath':
# inconsistent config: profiling.showmin # inconsistent config: profiling.showmin
limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05) limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05)
kwargs['limit'] = limit kwargs[r'limit'] = limit
statprof.display(fp, data=data, format=displayformat, **kwargs) statprof.display(fp, data=data, format=displayformat, **kwargs)
class profile(object): class profile(object):
"""Start profiling. """Start profiling.
Profiling is active when the context manager is active. When the context Profiling is active when the context manager is active. When the context
manager exits, profiling results will be written to the configured output. manager exits, profiling results will be written to the configured output.