This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2777

wireproto: raise ProgrammingError instead of Abort
ClosedPublic

Authored by indygreg on Mar 10 2018, 1:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGef68493d652b: wireproto: raise ProgrammingError instead of Abort
Summary

This isn't a user-facing error and can only be caused by bad
Python code.

Thanks to Yuya for spotting this.

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.Mar 10 2018, 1:28 PM
pulkit accepted this revision.Mar 11 2018, 3:29 AM
Closed by commit rHGef68493d652b: wireproto: raise ProgrammingError instead of Abort (authored by indygreg). · Explain WhyMar 11 2018, 3:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (9 lines)

Diff 6867

mercurial/wireproto.py

transports = set(wireprototypes.TRANSPORTS) transports = set(wireprototypes.TRANSPORTS)
elif transportpolicy == POLICY_V1_ONLY: elif transportpolicy == POLICY_V1_ONLY:
transports = {k for k, v in wireprototypes.TRANSPORTS.items() transports = {k for k, v in wireprototypes.TRANSPORTS.items()
if v['version'] == 1} if v['version'] == 1}
elif transportpolicy == POLICY_V2_ONLY: elif transportpolicy == POLICY_V2_ONLY:
transports = {k for k, v in wireprototypes.TRANSPORTS.items() transports = {k for k, v in wireprototypes.TRANSPORTS.items()
if v['version'] == 2} if v['version'] == 2}
else: else:
raise error.Abort(_('invalid transport policy value: %s') % raise error.ProgrammingError('invalid transport policy value: %s' %
transportpolicy) transportpolicy)
if permission not in ('push', 'pull'): if permission not in ('push', 'pull'):
raise error.Abort(_('invalid wire protocol permission; got %s; ' raise error.ProgrammingError('invalid wire protocol permission; '
'expected "push" or "pull"') % permission) 'got %s; expected "push" or "pull"' %
permission)
def register(func): def register(func):
commands[name] = commandentry(func, args=args, transports=transports, commands[name] = commandentry(func, args=args, transports=transports,
permission=permission) permission=permission)
return func return func
return register return register
# TODO define a more appropriate permissions type to use for this. # TODO define a more appropriate permissions type to use for this.