This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9348

errors: format "abort: " text in a new Abort.format() method
ClosedPublic

Authored by martinvonz on Nov 20 2020, 7:24 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG600aec73f309: errors: format "abort: " text in a new Abort.format() method
Summary

This remove some duplication we had.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 23599

mercurial/chgserver.py

try: try:
self.ui, lui = _loadnewui(self.ui, args, self.cdebug) self.ui, lui = _loadnewui(self.ui, args, self.cdebug)
except error.ParseError as inst: except error.ParseError as inst:
self.ui.warn(inst.format()) self.ui.warn(inst.format())
self.ui.flush() self.ui.flush()
self.cresult.write(b'exit 255') self.cresult.write(b'exit 255')
return return
except error.Abort as inst: except error.Abort as inst:
self.ui.error(_(b"abort: %s\n") % inst.message) self.ui.error(inst.format())
if inst.hint:
self.ui.error(_(b"(%s)\n") % inst.hint)
self.ui.flush() self.ui.flush()
self.cresult.write(b'exit 255') self.cresult.write(b'exit 255')
return return
newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) newhash = hashstate.fromui(lui, self.hashstate.mtimepaths)
insts = [] insts = []
if newhash.mtimehash != self.hashstate.mtimehash: if newhash.mtimehash != self.hashstate.mtimehash:
addr = _hashaddress(self.baseaddress, self.hashstate.confighash) addr = _hashaddress(self.baseaddress, self.hashstate.confighash)
insts.append(b'unlink %s' % addr) insts.append(b'unlink %s' % addr)

mercurial/dispatch.py

req.ui.fin = req.fin req.ui.fin = req.fin
if req.fout: if req.fout:
req.ui.fout = req.fout req.ui.fout = req.fout
if req.ferr: if req.ferr:
req.ui.ferr = req.ferr req.ui.ferr = req.ferr
if req.fmsg: if req.fmsg:
req.ui.fmsg = req.fmsg req.ui.fmsg = req.fmsg
except error.Abort as inst: except error.Abort as inst:
ferr.write(_(b"abort: %s\n") % inst.message) ferr.write(inst.format())
if inst.hint:
ferr.write(_(b"(%s)\n") % inst.hint)
return -1 return -1
except error.ParseError as inst: except error.ParseError as inst:
ferr.write(inst.format()) ferr.write(inst.format())
return -1 return -1
msg = _formatargs(req.args) msg = _formatargs(req.args)
starttime = util.timer() starttime = util.timer()
ret = 1 # default of Python exit code on unhandled exception ret = 1 # default of Python exit code on unhandled exception

mercurial/error.py

if pycompat.ispy3: if pycompat.ispy3:
def __str__(self): def __str__(self):
# the output would be unreadable if the message was translated, # the output would be unreadable if the message was translated,
# but do not replace it with encoding.strfromlocal(), which # but do not replace it with encoding.strfromlocal(), which
# may raise another exception. # may raise another exception.
return pycompat.sysstr(self.__bytes__()) return pycompat.sysstr(self.__bytes__())
def format(self):
from .i18n import _
message = _(b"abort: %s\n") % self.message
if self.hint:
message += _(b"(%s)\n") % self.hint
return message
class InputError(Abort): class InputError(Abort):
"""Indicates that the user made an error in their input. """Indicates that the user made an error in their input.
Examples: Invalid command, invalid flags, invalid revision. Examples: Invalid command, invalid flags, invalid revision.
""" """

mercurial/scmutil.py

if isinstance(inst, error.InputError): if isinstance(inst, error.InputError):
detailed_exit_code = 10 detailed_exit_code = 10
elif isinstance(inst, error.StateError): elif isinstance(inst, error.StateError):
detailed_exit_code = 20 detailed_exit_code = 20
elif isinstance(inst, error.ConfigError): elif isinstance(inst, error.ConfigError):
detailed_exit_code = 30 detailed_exit_code = 30
elif isinstance(inst, error.CanceledError): elif isinstance(inst, error.CanceledError):
detailed_exit_code = 250 detailed_exit_code = 250
ui.error(_(b"abort: %s\n") % inst.message) ui.error(inst.format())
if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint)
except error.WorkerError as inst: except error.WorkerError as inst:
# Don't print a message -- the worker already should have # Don't print a message -- the worker already should have
return inst.status_code return inst.status_code
except ImportError as inst: 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] m = stringutil.forcebytestr(inst).split()[-1]
if m in b"mpatch bdiff".split(): if m in b"mpatch bdiff".split():
ui.error(_(b"(did you forget to compile extensions?)\n")) ui.error(_(b"(did you forget to compile extensions?)\n"))

mercurial/wireprotov1server.py

if not getattr(exc, 'duringunbundle2', False): if not getattr(exc, 'duringunbundle2', False):
try: try:
raise raise
except error.Abort as exc: except error.Abort as exc:
# The old code we moved used procutil.stderr directly. # The old code we moved used procutil.stderr directly.
# We did not change it to minimise code change. # We did not change it to minimise code change.
# This need to be moved to something proper. # This need to be moved to something proper.
# Feel free to do it. # Feel free to do it.
procutil.stderr.write(b"abort: %s\n" % exc.message) procutil.stderr.write(exc.format())
if exc.hint is not None:
procutil.stderr.write(b"(%s)\n" % exc.hint)
procutil.stderr.flush() procutil.stderr.flush()
return wireprototypes.pushres( return wireprototypes.pushres(
0, output.getvalue() if output else b'' 0, output.getvalue() if output else b''
) )
except error.PushRaced: except error.PushRaced:
return wireprototypes.pusherr( return wireprototypes.pusherr(
pycompat.bytestr(exc), pycompat.bytestr(exc),
output.getvalue() if output else b'', output.getvalue() if output else b'',