errors: name arguments to CommandError constructor
Because readability counts.
Differential Revision: https://phab.mercurial-scm.org/D9164
--- a/mercurial/dispatch.py Tue Oct 06 21:52:27 2020 -0700
+++ b/mercurial/dispatch.py Tue Oct 06 20:37:35 2020 -0700
@@ -492,13 +492,13 @@
% (inst.args[0], b" ".join(inst.args[1]))
)
except error.CommandError as inst:
- if inst.args[0]:
+ if inst.command:
ui.pager(b'help')
- msgbytes = pycompat.bytestr(inst.args[1])
- ui.warn(_(b"hg %s: %s\n") % (inst.args[0], msgbytes))
- commands.help_(ui, inst.args[0], full=False, command=True)
+ msgbytes = pycompat.bytestr(inst.message)
+ ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes))
+ commands.help_(ui, inst.command, full=False, command=True)
else:
- ui.warn(_(b"hg: %s\n") % inst.args[1])
+ ui.warn(_(b"hg: %s\n") % inst.message)
ui.warn(_(b"(use 'hg help -v' for a list of global options)\n"))
except error.ParseError as inst:
_formatparse(ui.warn, inst)
--- a/mercurial/error.py Tue Oct 06 21:52:27 2020 -0700
+++ b/mercurial/error.py Tue Oct 06 20:37:35 2020 -0700
@@ -100,6 +100,11 @@
class CommandError(Exception):
"""Exception raised on errors in parsing the command line."""
+ def __init__(self, command, message):
+ self.command = command
+ self.message = message
+ super(CommandError, self).__init__()
+
__bytes__ = _tobytes