Mercurial > public > mercurial-scm > hg
comparison mercurial/dispatch.py @ 45885: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 | 7eb221b9af6c |
comparison
equal
deleted
inserted
replaced
45884:98399dd1b96c | 45885:600aec73f309 |
---|---|
254 if req.ferr: | 254 if req.ferr: |
255 req.ui.ferr = req.ferr | 255 req.ui.ferr = req.ferr |
256 if req.fmsg: | 256 if req.fmsg: |
257 req.ui.fmsg = req.fmsg | 257 req.ui.fmsg = req.fmsg |
258 except error.Abort as inst: | 258 except error.Abort as inst: |
259 ferr.write(_(b"abort: %s\n") % inst.message) | 259 ferr.write(inst.format()) |
260 if inst.hint: | |
261 ferr.write(_(b"(%s)\n") % inst.hint) | |
262 return -1 | 260 return -1 |
263 except error.ParseError as inst: | 261 except error.ParseError as inst: |
264 ferr.write(inst.format()) | 262 ferr.write(inst.format()) |
265 return -1 | 263 return -1 |
266 | 264 |