This is an archive of the discontinued Mercurial Phabricator instance.

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 23595

mercurial/dispatch.py

	ui.warn(nocmdmsg)			ui.warn(nocmdmsg)
	ui.write(formatted)			ui.write(formatted)
	except (error.UnknownCommand, error.Abort):			except (error.UnknownCommand, error.Abort):
	suggested = False			suggested = False
	if inst.all_commands:			if inst.all_commands:
	sim = scmutil.getsimilar(inst.all_commands, inst.command)			sim = scmutil.getsimilar(inst.all_commands, inst.command)
	if sim:			if sim:
	ui.warn(nocmdmsg)			ui.warn(nocmdmsg)
	scmutil.reportsimilar(ui.warn, sim)			ui.warn(b"(%s)\n" % scmutil.similarity_hint(sim))
	suggested = True			suggested = True
	if not suggested:			if not suggested:
	ui.warn(nocmdmsg)			ui.warn(nocmdmsg)
	ui.warn(_(b"(use 'hg help' for a list of commands)\n"))			ui.warn(_(b"(use 'hg help' for a list of commands)\n"))
	except IOError:			except IOError:
	raise			raise
	except KeyboardInterrupt:			except KeyboardInterrupt:
	raise			raise

mercurial/scmutil.py


	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
	# probably be investigated and tweaked.			# probably be investigated and tweaked.
	return [s for s in symbols if sim(s) > 0.6]			return [s for s in symbols if sim(s) > 0.6]


	def reportsimilar(write, similar):			def similarity_hint(similar):
	if len(similar) == 1:			if len(similar) == 1:
	write(_(b"(did you mean %s?)\n") % similar[0])			return _(b"did you mean %s?") % similar[0]
	elif similar:			elif similar:
	ss = b", ".join(sorted(similar))			ss = b", ".join(sorted(similar))
	write(_(b"(did you mean one of %s?)\n") % ss)			return _(b"did you mean one of %s?") % ss
				else:
				return None


	def formatparse(write, inst):			def formatparse(write, inst):
	if inst.location is not None:			if inst.location is not None:
	write(			write(
	_(b"hg: parse error at %s: %s\n")			_(b"hg: parse error at %s: %s\n")
	% (pycompat.bytestr(inst.location), inst.message)			% (pycompat.bytestr(inst.location), inst.message)
	)			)
	else:			else:
	write(_(b"hg: parse error: %s\n") % inst.message)			write(_(b"hg: parse error: %s\n") % inst.message)
	if isinstance(inst, error.UnknownIdentifier):			if isinstance(inst, error.UnknownIdentifier):
	# make sure to check fileset first, as revset can invoke fileset			# make sure to check fileset first, as revset can invoke fileset
	similar = getsimilar(inst.symbols, inst.function)			similar = getsimilar(inst.symbols, inst.function)
	reportsimilar(write, similar)			hint = similarity_hint(similar)
				if hint:
				write(b"(%s)\n" % hint)
	elif inst.hint:			elif inst.hint:
	write(_(b"(%s)\n") % 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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23581		Nov 20 2020, 7:24 PM	★	★
Diff 2	23595	rHGbb1b7a5bc96b618713ca868c9ee0d8e07a9cda52	Nov 19 2020, 12:19 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

errors: morph reportsimilar() into similarity_hint()ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23595

mercurial/dispatch.py

mercurial/scmutil.py

errors: morph reportsimilar() into similarity_hint()
ClosedPublic

Revision Contents
Changeset List