This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1303

py3: handle keyword arguments in hgext/gpg.py
ClosedPublic

Authored by pulkit on Nov 2 2017, 5:15 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGde1f045781e0: py3: handle keyword arguments in hgext/gpg.py
Summary

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

pulkit created this revision.Nov 2 2017, 5:15 PM
yuja accepted this revision.Nov 4 2017, 3:37 AM
This revision is now accepted and ready to land.Nov 4 2017, 3:37 AM
yuja added inline comments.Nov 4 2017, 3:37 AM
hgext/gpg.py
317

Fixed this to call strkwargs().

Closed by commit rHGde1f045781e0: py3: handle keyword arguments in hgext/gpg.py (authored by pulkit). · Explain WhyNov 4 2017, 3:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/gpg.py (6 lines)

Diff 3278

hgext/gpg.py

fingerprint = None fingerprint = None
if key is not None: if key is not None:
keys.append(key + [fingerprint]) keys.append(key + [fingerprint])
return keys return keys
def newgpg(ui, **opts): def newgpg(ui, **opts):
"""create a new gpg instance""" """create a new gpg instance"""
gpgpath = ui.config("gpg", "cmd") gpgpath = ui.config("gpg", "cmd")
gpgkey = opts.get('key') gpgkey = opts.get(r'key')
if not gpgkey: if not gpgkey:
gpgkey = ui.config("gpg", "key") gpgkey = ui.config("gpg", "key")
return gpg(gpgpath, gpgkey) return gpg(gpgpath, gpgkey)
def sigwalk(repo): def sigwalk(repo):
""" """
walk over every sigs, yields a couple walk over every sigs, yields a couple
((node, version, sig), (filename, linenumber)) ((node, version, sig), (filename, linenumber))
See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date.
""" """
with repo.wlock(): with repo.wlock():
return _dosign(ui, repo, *revs, **opts) return _dosign(ui, repo, *revs, **opts)
def _dosign(ui, repo, *revs, **opts): def _dosign(ui, repo, *revs, **opts):
mygpg = newgpg(ui, **opts) mygpg = newgpg(ui, **opts)
opts = pycompat.byteskwargs(opts)
sigver = "0" sigver = "0"
sigmessage = "" sigmessage = ""
date = opts.get('date') date = opts.get('date')
if date: if date:
opts['date'] = util.parsedate(date) opts['date'] = util.parsedate(date)
if revs: if revs:
message = opts['message'] message = opts['message']
if not message: if not message:
# we don't translate commit messages # we don't translate commit messages
message = "\n".join(["Added signature for changeset %s" message = "\n".join(["Added signature for changeset %s"
% hgnode.short(n) % hgnode.short(n)
for n in nodes]) for n in nodes])
try: try:
editor = cmdutil.getcommiteditor(editform='gpg.sign', **opts) editor = cmdutil.getcommiteditor(editform='gpg.sign',
**pycompat.strkwargs(opts))
yujaUnsubmitted
Not Done

Fixed this to call strkwargs().

yuja: Fixed this to call strkwargs().
repo.commit(message, opts['user'], opts['date'], match=msigs, repo.commit(message, opts['user'], opts['date'], match=msigs,
editor=editor) editor=editor)
except ValueError as inst: except ValueError as inst:
raise error.Abort(str(inst)) raise error.Abort(str(inst))
def shortkey(ui, key): def shortkey(ui, key):
if len(key) != 16: if len(key) != 16:
ui.debug("key ID \"%s\" format error\n" % key) ui.debug("key ID \"%s\" format error\n" % key)