This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1633

py3: handle keyword arguments correctly in hook.py
ClosedPublic

Authored by pulkit on Dec 9 2017, 8:09 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG056a9c8813aa: py3: handle keyword arguments correctly in hook.py
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Dec 9 2017, 8:09 PM
durin42 accepted this revision.Dec 9 2017, 9:00 PM
This revision is now accepted and ready to land.Dec 9 2017, 9:00 PM
Closed by commit rHG056a9c8813aa: py3: handle keyword arguments correctly in hook.py (authored by pulkit). · Explain WhyDec 9 2017, 9:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hook.py (2 lines)

Diff 4300

mercurial/hook.py

raise error.HookLoadError( raise error.HookLoadError(
_('%s hook is invalid: "%s" is not callable') _('%s hook is invalid: "%s" is not callable')
% (hname, funcname)) % (hname, funcname))
ui.note(_("calling hook %s: %s\n") % (hname, funcname)) ui.note(_("calling hook %s: %s\n") % (hname, funcname))
starttime = util.timer() starttime = util.timer()
try: try:
r = obj(ui=ui, repo=repo, hooktype=htype, **args) r = obj(ui=ui, repo=repo, hooktype=htype, **pycompat.strkwargs(args))
except Exception as exc: except Exception as exc:
if isinstance(exc, error.Abort): if isinstance(exc, error.Abort):
ui.warn(_('error: %s hook failed: %s\n') % ui.warn(_('error: %s hook failed: %s\n') %
(hname, exc.args[0])) (hname, exc.args[0]))
else: else:
ui.warn(_('error: %s hook raised an exception: ' ui.warn(_('error: %s hook raised an exception: '
'%s\n') % (hname, encoding.strtolocal(str(exc)))) '%s\n') % (hname, encoding.strtolocal(str(exc))))
if throw: if throw: