This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9149

py3: use native string when comparing with a function's argspec
ClosedPublic

Authored by Alphare on Oct 5 2020, 5:03 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7d0e54056586: py3: use native string when comparing with a function's argspec
Summary

I only found two such bugs in contrib/perf.py

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Oct 5 2020, 5:03 AM
pulkit accepted this revision.Oct 6 2020, 4:26 AM
This revision is now accepted and ready to land.Oct 6 2020, 4:26 AM

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (4 lines)

Diff 23036

contrib/perf.py

def parsealiases(cmd): def parsealiases(cmd):
return cmd.split(b"|") return cmd.split(b"|")
if safehasattr(registrar, 'command'): if safehasattr(registrar, 'command'):
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
elif safehasattr(cmdutil, 'command'): elif safehasattr(cmdutil, 'command'):
command = cmdutil.command(cmdtable) command = cmdutil.command(cmdtable)
if b'norepo' not in getargspec(command).args: if 'norepo' not in getargspec(command).args:
# for "historical portability": # for "historical portability":
# wrap original cmdutil.command, because "norepo" option has # wrap original cmdutil.command, because "norepo" option has
# been available since 3.1 (or 75a96326cecb) # been available since 3.1 (or 75a96326cecb)
_command = command _command = command
def command(name, options=(), synopsis=None, norepo=False): def command(name, options=(), synopsis=None, norepo=False):
if norepo: if norepo:
commands.norepo += b' %s' % b' '.join(parsealiases(name)) commands.norepo += b' %s' % b' '.join(parsealiases(name))
def perfaddremove(ui, repo, **opts): def perfaddremove(ui, repo, **opts):
opts = _byteskwargs(opts) opts = _byteskwargs(opts)
timer, fm = gettimer(ui, opts) timer, fm = gettimer(ui, opts)
try: try:
oldquiet = repo.ui.quiet oldquiet = repo.ui.quiet
repo.ui.quiet = True repo.ui.quiet = True
matcher = scmutil.match(repo[None]) matcher = scmutil.match(repo[None])
opts[b'dry_run'] = True opts[b'dry_run'] = True
if b'uipathfn' in getargspec(scmutil.addremove).args: if 'uipathfn' in getargspec(scmutil.addremove).args:
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
timer(lambda: scmutil.addremove(repo, matcher, b"", uipathfn, opts)) timer(lambda: scmutil.addremove(repo, matcher, b"", uipathfn, opts))
else: else:
timer(lambda: scmutil.addremove(repo, matcher, b"", opts)) timer(lambda: scmutil.addremove(repo, matcher, b"", opts))
finally: finally:
repo.ui.quiet = oldquiet repo.ui.quiet = oldquiet
fm.end() fm.end()