# HG changeset patch # User Gregory Szorc # Date 1520706476 28800 # Node ID ef68493d652b8e51dd8b8c6430ccd3cad0b63856 # Parent 5b9ae9eca94a048caf8d2f9d323c8d85cec669ae wireproto: raise ProgrammingError instead of Abort This isn't a user-facing error and can only be caused by bad Python code. Thanks to Yuya for spotting this. Differential Revision: https://phab.mercurial-scm.org/D2777 diff -r 5b9ae9eca94a -r ef68493d652b mercurial/wireproto.py --- a/mercurial/wireproto.py Sat Mar 10 19:56:47 2018 +0900 +++ b/mercurial/wireproto.py Sat Mar 10 10:27:56 2018 -0800 @@ -704,12 +704,13 @@ transports = {k for k, v in wireprototypes.TRANSPORTS.items() if v['version'] == 2} else: - raise error.Abort(_('invalid transport policy value: %s') % - transportpolicy) + raise error.ProgrammingError('invalid transport policy value: %s' % + transportpolicy) if permission not in ('push', 'pull'): - raise error.Abort(_('invalid wire protocol permission; got %s; ' - 'expected "push" or "pull"') % permission) + raise error.ProgrammingError('invalid wire protocol permission; ' + 'got %s; expected "push" or "pull"' % + permission) def register(func): commands[name] = commandentry(func, args=args, transports=transports,