This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9350

errors: make ParseError a subtype of Abort
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG7eb221b9af6c: errors: make ParseError a subtype of Abort
Summary

I didn't plan this before, but the previous two changes made it really
easy to make ParseError a subtype of Abort. It seems obvious with
hindsight that I *should* have planned it :)

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 20 2020, 7:24 PM
mharbison72 accepted this revision.Nov 20 2020, 9:45 PM
This revision is now accepted and ready to land.Nov 20 2020, 9:45 PM
martinvonz added a commit: rHG7eb221b9af6c: errors: make ParseError a subtype of Abort.Nov 20 2020, 9:51 PM
Closed by commit rHG7eb221b9af6c: errors: make ParseError a subtype of Abort (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (5 lines)
Mmercurial/dispatch.py (6 lines)
Mmercurial/error.py (5 lines)

Diff 23587

mercurial/chgserver.py

reconnect. reconnect.
If neither "reconnect" nor "redirect" is included in the instruction If neither "reconnect" nor "redirect" is included in the instruction
list, the client can continue with this server after completing all list, the client can continue with this server after completing all
the instructions. the instructions.
""" """
args = self._readlist() args = self._readlist()
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:
self.ui.warn(inst.format())
self.ui.flush()
self.cresult.write(b'exit 255')
return
except error.Abort as inst: except error.Abort as inst:
self.ui.error(inst.format()) self.ui.error(inst.format())
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:

mercurial/dispatch.py

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(inst.format()) ferr.write(inst.format())
return -1 return -1
except error.ParseError as inst:
ferr.write(inst.format())
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
try: try:
ret = _runcatch(req) or 0 ret = _runcatch(req) or 0
except error.ProgrammingError as inst: except error.ProgrammingError as inst:
req.ui.error(_(b'** ProgrammingError: %s\n') % inst) req.ui.error(_(b'** ProgrammingError: %s\n') % inst)
if inst.command: if inst.command:
ui.pager(b'help') ui.pager(b'help')
msgbytes = pycompat.bytestr(inst.message) msgbytes = pycompat.bytestr(inst.message)
ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes)) ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes))
commands.help_(ui, inst.command, full=False, command=True) commands.help_(ui, inst.command, full=False, command=True)
else: else:
ui.warn(_(b"hg: %s\n") % inst.message) ui.warn(_(b"hg: %s\n") % inst.message)
ui.warn(_(b"(use 'hg help -v' for a list of global options)\n")) ui.warn(_(b"(use 'hg help -v' for a list of global options)\n"))
except error.ParseError as inst:
ui.warn(inst.format())
return -1
except error.UnknownCommand as inst: except error.UnknownCommand as inst:
nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command
try: try:
# check if the command is in a disabled extension # check if the command is in a disabled extension
# (but don't check for extensions themselves) # (but don't check for extensions themselves)
formatted = help.formattedhelp( formatted = help.formattedhelp(
ui, commands, inst.command, unknowncmd=True ui, commands, inst.command, unknowncmd=True
) )

mercurial/error.py

class OutOfBandError(Hint, Exception): class OutOfBandError(Hint, Exception):
"""Exception raised when a remote repo reports failure""" """Exception raised when a remote repo reports failure"""
__bytes__ = _tobytes __bytes__ = _tobytes
class ParseError(Hint, Exception): class ParseError(Abort):
"""Raised when parsing config files and {rev,file}sets (msg[, pos])""" """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
def __init__(self, message, location=None, hint=None): def __init__(self, message, location=None, hint=None):
self.message = message super(ParseError, self).__init__(message, hint=hint)
self.location = location self.location = location
self.hint = hint
# Pass the message and possibly location into the Exception constructor # Pass the message and possibly location into the Exception constructor
# to help code that looks for exc.args. # to help code that looks for exc.args.
if location is not None: if location is not None:
Exception.__init__(self, message, location) Exception.__init__(self, message, location)
else: else:
Exception.__init__(self, message) Exception.__init__(self, message)
__bytes__ = _tobytes __bytes__ = _tobytes