Mercurial > hg-stable
diff mercurial/scmutil.py @ 45900:600aec73f309
errors: format "abort: " text in a new Abort.format() method
This remove some duplication we had.
Differential Revision: https://phab.mercurial-scm.org/D9348
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 20 Nov 2020 09:17:38 -0800 |
| parents | 98399dd1b96c |
| children | fc4fb2f17dd4 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Nov 20 08:51:45 2020 -0800 +++ b/mercurial/scmutil.py Fri Nov 20 09:17:38 2020 -0800 @@ -230,9 +230,7 @@ detailed_exit_code = 30 elif isinstance(inst, error.CanceledError): detailed_exit_code = 250 - ui.error(_(b"abort: %s\n") % inst.message) - if inst.hint: - ui.error(_(b"(%s)\n") % inst.hint) + ui.error(inst.format()) except error.WorkerError as inst: # Don't print a message -- the worker already should have return inst.status_code