Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 45899:98399dd1b96c
errors: make formatparse() an instance method on ParseError
It's just a little simpler this way.
Don't ask me what the "hg: " prefix signifies to the user, I just left
it as it was. I think we should consider changing the prefixes later
(maybe always use "abort: ", or maybe use more specific prefixes in
general).
Differential Revision: https://phab.mercurial-scm.org/D9347
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 20 Nov 2020 08:51:45 -0800 |
| parents | 8cc9e7f762d6 |
| children | 600aec73f309 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Nov 19 11:23:59 2020 -0800 +++ b/mercurial/dispatch.py Fri Nov 20 08:51:45 2020 -0800 @@ -261,7 +261,7 @@ ferr.write(_(b"(%s)\n") % inst.hint) return -1 except error.ParseError as inst: - scmutil.formatparse(ferr.write, inst) + ferr.write(inst.format()) return -1 msg = _formatargs(req.args) @@ -469,7 +469,7 @@ 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: - scmutil.formatparse(ui.warn, inst) + ui.warn(inst.format()) return -1 except error.UnknownCommand as inst: nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command