This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9347

errors: make formatparse() an instance method on ParseError
ClosedPublic

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

Download Raw Diff

Details

Reviewers

mharbison72

Group Reviewers

hg-reviewers

Commits

rHG98399dd1b96c: errors: make formatparse() an instance method on ParseError

Summary

It's just a little simpler this way.

Don't ask me what the "hg: " prefix signifies to the user, I just left
it as it was. I think we should consider changing the prefixes later
(maybe always use "abort: ", or maybe use more specific prefixes in
general).

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.

Event Timeline

martinvonz created this revision.Nov 20 2020, 7:24 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 20 2020, 7:24 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D9348: errors: format "abort: " text in a new Abort.format() method.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: rHG98399dd1b96c: errors: make formatparse() an instance method on ParseError.Nov 20 2020, 9:51 PM

Closed by commit rHG98399dd1b96c: errors: make formatparse() an instance method on ParseError (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/chgserver.py (3 lines)
M			mercurial/dispatch.py (4 lines)
M			mercurial/error.py (14 lines)
M			mercurial/scmutil.py (12 lines)

Status	Author	Revision
Closed	martinvonz	D9340 errors: raise InputError in `hg absorb`
Closed	martinvonz	D9339 errors: introduce CanceledError and use it in a few places
Closed	martinvonz	D9338 errors: raise InputError in `hg split`
Closed	martinvonz	D9337 errors: raise StateError in `hg bisect`
Closed	martinvonz	D9336 errors: raise InputError in `hg debugobsolete`
Closed	martinvonz	D9333 errors: raise InputError when line range to followlines() is out of bounds
Closed	martinvonz	D9332 errors: use exit code 10 for parse errors
Closed	martinvonz	D9355 errors: raise ConfigError on failure to parse config file
Closed	martinvonz	D9354 errors: remove ParseError.args
Closed	martinvonz	D9353 errors: let ParseError use Abort.__bytes__
Closed	martinvonz	D9352 config: clean up message about ignored untrusted config
Closed	martinvonz	D9351 tests: use new ParseError.format() in test-trusted.py
Closed	martinvonz	D9350 errors: make ParseError a subtype of Abort
Closed	martinvonz	D9349 tests: make doctests not depend on str(ParseError()) format
Closed	martinvonz	D9348 errors: format "abort: " text in a new Abort.format() method
Closed	martinvonz	D9347 errors: make formatparse() an instance method on ParseError
Closed	martinvonz	D9346 errors: create "similarity hint" for UnknownIdentifier eagerly in constructor
Closed	martinvonz	D9345 errors: move similarity_hint() to error module
Closed	martinvonz	D9344 errors: morph reportsimilar() into similarity_hint()
Closed	martinvonz	D9343 errors: restructure formatparse() to clarify conditions a bit

Diff 23598

mercurial/chgserver.py


	from . import (			from . import (
	commandserver,			commandserver,
	encoding,			encoding,
	error,			error,
	extensions,			extensions,
	node,			node,
	pycompat,			pycompat,
	scmutil,
	util,			util,
	)			)

	from .utils import (			from .utils import (
	hashutil,			hashutil,
	procutil,			procutil,
	stringutil,			stringutil,
	)			)
	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:			except error.ParseError as inst:
	scmutil.formatparse(self.ui.warn, inst)			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(_(b"abort: %s\n") % inst.message)
	if inst.hint:			if inst.hint:
	self.ui.error(_(b"(%s)\n") % inst.hint)			self.ui.error(_(b"(%s)\n") % inst.hint)
	self.ui.flush()			self.ui.flush()

mercurial/dispatch.py

	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(_(b"abort: %s\n") % inst.message)
	if inst.hint:			if inst.hint:
	ferr.write(_(b"(%s)\n") % inst.hint)			ferr.write(_(b"(%s)\n") % inst.hint)
	return -1			return -1
	except error.ParseError as inst:			except error.ParseError as inst:
	scmutil.formatparse(ferr.write, inst)			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
	try:			try:
	ret = _runcatch(req) or 0			ret = _runcatch(req) or 0
	except error.ProgrammingError as inst:			except error.ProgrammingError as inst:
	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:			except error.ParseError as inst:
	scmutil.formatparse(ui.warn, inst)			ui.warn(inst.format())
	return -1			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

	# 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

				def format(self):
				from .i18n import _

				if self.location is not None:
				message = _(b"hg: parse error at %s: %s\n") % (
				pycompat.bytestr(self.location),
				self.message,
				)
				else:
				message = _(b"hg: parse error: %s\n") % self.message
				if self.hint:
				message += _(b"(%s)\n") % self.hint
				return message


	class PatchError(Exception):			class PatchError(Exception):
	__bytes__ = _tobytes			__bytes__ = _tobytes


	def getsimilar(symbols, value):			def getsimilar(symbols, value):
	sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()			sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
	# The cutoff for similarity here is pretty arbitrary. It should			# The cutoff for similarity here is pretty arbitrary. It should

mercurial/scmutil.py

	ui.status(			ui.status(
	_(b"no changes found (ignored %d secret changesets)\n")			_(b"no changes found (ignored %d secret changesets)\n")
	% len(secretlist)			% len(secretlist)
	)			)
	else:			else:
	ui.status(_(b"no changes found\n"))			ui.status(_(b"no changes found\n"))


	def formatparse(write, inst):
	if inst.location is not None:
	write(
	_(b"hg: parse error at %s: %s\n")
	% (pycompat.bytestr(inst.location), inst.message)
	)
	else:
	write(_(b"hg: parse error: %s\n") % inst.message)
	if inst.hint:
	write(_(b"(%s)\n") % inst.hint)


	def callcatch(ui, func):			def callcatch(ui, func):
	"""call func() with global exception handling			"""call func() with global exception handling

	return func() if no exception happens. otherwise do some error handling			return func() if no exception happens. otherwise do some error handling
	and return an exit code accordingly. does not handle all exceptions.			and return an exit code accordingly. does not handle all exceptions.
	"""			"""
	coarse_exit_code = -1			coarse_exit_code = -1
	detailed_exit_code = -1			detailed_exit_code = -1

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23584		Nov 20 2020, 7:24 PM	★	★
Diff 2	23598	rHG98399dd1b96cb4d1990bb693e748a095cd7cb43c	Nov 20 2020, 11:51 AM	★	★