Mercurial > public > mercurial-scm > hg-stable
diff mercurial/scmutil.py @ 45921:95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Some types of exceptions had a trailing "!" printed after the message
from the exception itself. I guess some of these errors seem a little
more severe (?), but it seems more likely that the inconsistency was
just an oversight.
Differential Revision: https://phab.mercurial-scm.org/D9378
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 23 Nov 2020 11:18:48 -0800 |
| parents | fc4fb2f17dd4 |
| children | 8f50dc096cf4 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Mon Nov 23 12:20:19 2020 +0100 +++ b/mercurial/scmutil.py Mon Nov 23 11:18:48 2020 -0800 @@ -193,7 +193,7 @@ if inst.hint: ui.error(b'(%s)\n' % inst.hint) except error.RepoError as inst: - ui.error(_(b"abort: %s!\n") % inst) + ui.error(_(b"abort: %s\n") % inst) if inst.hint: ui.error(_(b"(%s)\n") % inst.hint) except error.ResponseError as inst: @@ -208,9 +208,9 @@ else: ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) except error.CensoredNodeError as inst: - ui.error(_(b"abort: file censored %s!\n") % inst) + ui.error(_(b"abort: file censored %s\n") % inst) except error.StorageError as inst: - ui.error(_(b"abort: %s!\n") % inst) + ui.error(_(b"abort: %s\n") % inst) if inst.hint: ui.error(_(b"(%s)\n") % inst.hint) except error.InterventionRequired as inst: @@ -235,7 +235,7 @@ # Don't print a message -- the worker already should have return inst.status_code except ImportError as inst: - ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst)) + ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst)) m = stringutil.forcebytestr(inst).split()[-1] if m in b"mpatch bdiff".split(): ui.error(_(b"(did you forget to compile extensions?)\n"))