Mercurial > hg
comparison mercurial/dispatch.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 | bb1a988ef4a5 |
| children | 0fc8b066928a |
comparison
equal
deleted
inserted
replaced
| 45681:a736ab681b78 | 45682:d2e1dcd4490d |
|---|---|
| 286 if req.ferr: | 286 if req.ferr: |
| 287 req.ui.ferr = req.ferr | 287 req.ui.ferr = req.ferr |
| 288 if req.fmsg: | 288 if req.fmsg: |
| 289 req.ui.fmsg = req.fmsg | 289 req.ui.fmsg = req.fmsg |
| 290 except error.Abort as inst: | 290 except error.Abort as inst: |
| 291 ferr.write(_(b"abort: %s\n") % inst) | 291 ferr.write(_(b"abort: %s\n") % inst.message) |
| 292 if inst.hint: | 292 if inst.hint: |
| 293 ferr.write(_(b"(%s)\n") % inst.hint) | 293 ferr.write(_(b"(%s)\n") % inst.hint) |
| 294 return -1 | 294 return -1 |
| 295 except error.ParseError as inst: | 295 except error.ParseError as inst: |
| 296 _formatparse(ferr.write, inst) | 296 _formatparse(ferr.write, inst) |