Mercurial > public > mercurial-scm > hg
comparison mercurial/scmutil.py @ 45682:d2e1dcd4490d
errors: name arguments to Abort constructor
Differential Revision: https://phab.mercurial-scm.org/D9179
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 08 Oct 2020 13:37:31 -0700 |
parents | 10284ce3d5ed |
children | 508dfd1c18df |
comparison
equal
deleted
inserted
replaced
45681:a736ab681b78 | 45682:d2e1dcd4490d |
---|---|
214 ui.error(_(b"(%s)\n") % inst.hint) | 214 ui.error(_(b"(%s)\n") % inst.hint) |
215 return 1 | 215 return 1 |
216 except error.WdirUnsupported: | 216 except error.WdirUnsupported: |
217 ui.error(_(b"abort: working directory revision cannot be specified\n")) | 217 ui.error(_(b"abort: working directory revision cannot be specified\n")) |
218 except error.Abort as inst: | 218 except error.Abort as inst: |
219 ui.error(_(b"abort: %s\n") % inst) | 219 ui.error(_(b"abort: %s\n") % inst.message) |
220 if inst.hint: | 220 if inst.hint: |
221 ui.error(_(b"(%s)\n") % inst.hint) | 221 ui.error(_(b"(%s)\n") % inst.hint) |
222 except ImportError as inst: | 222 except ImportError as inst: |
223 ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst)) | 223 ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst)) |
224 m = stringutil.forcebytestr(inst).split()[-1] | 224 m = stringutil.forcebytestr(inst).split()[-1] |