This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9164

errors: name arguments to CommandError constructor
ClosedPublic

Authored by martinvonz on Oct 7 2020, 2:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbd2df58366b1: errors: name arguments to CommandError constructor
Summary

Because readability counts.

Diff Detail

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

Event Timeline

martinvonz created this revision.Oct 7 2020, 2:10 AM
pulkit accepted this revision.Oct 7 2020, 7:43 AM
This revision is now accepted and ready to land.Oct 7 2020, 7:43 AM
martinvonz added a commit: rHGbd2df58366b1: errors: name arguments to CommandError constructor.Oct 9 2020, 6:16 AM
Closed by commit rHGbd2df58366b1: errors: name arguments to CommandError constructor (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (10 lines)
Mmercurial/error.py (5 lines)

Diff 23069

mercurial/dispatch.py

try: try:
return scmutil.callcatch(ui, func) return scmutil.callcatch(ui, func)
except error.AmbiguousCommand as inst: except error.AmbiguousCommand as inst:
ui.warn( ui.warn(
_(b"hg: command '%s' is ambiguous:\n %s\n") _(b"hg: command '%s' is ambiguous:\n %s\n")
% (inst.args[0], b" ".join(inst.args[1])) % (inst.args[0], b" ".join(inst.args[1]))
) )
except error.CommandError as inst: except error.CommandError as inst:
if inst.args[0]: if inst.command:
ui.pager(b'help') ui.pager(b'help')
msgbytes = pycompat.bytestr(inst.args[1]) msgbytes = pycompat.bytestr(inst.message)
ui.warn(_(b"hg %s: %s\n") % (inst.args[0], msgbytes)) ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes))
commands.help_(ui, inst.args[0], full=False, command=True) commands.help_(ui, inst.command, full=False, command=True)
else: else:
ui.warn(_(b"hg: %s\n") % inst.args[1]) 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: except error.ParseError as inst:
_formatparse(ui.warn, inst) _formatparse(ui.warn, inst)
return -1 return -1
except error.UnknownCommand as inst: except error.UnknownCommand as inst:
nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.args[0] nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.args[0]
try: try:
# check if the command is in a disabled extension # check if the command is in a disabled extension

mercurial/error.py

class ManifestLookupError(LookupError): class ManifestLookupError(LookupError):
pass pass
class CommandError(Exception): class CommandError(Exception):
"""Exception raised on errors in parsing the command line.""" """Exception raised on errors in parsing the command line."""
def __init__(self, command, message):
self.command = command
self.message = message
super(CommandError, self).__init__()
__bytes__ = _tobytes __bytes__ = _tobytes
class UnknownCommand(Exception): class UnknownCommand(Exception):
"""Exception raised if command is not in the command table.""" """Exception raised if command is not in the command table."""
__bytes__ = _tobytes __bytes__ = _tobytes