This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9344

errors: morph reportsimilar() into similarity_hint()
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGbb1b7a5bc96b: errors: morph reportsimilar() into similarity_hint()
Summary

The next step is to eagerly create the hint in UnknownIdentifier's
constructor.

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: rHGbb1b7a5bc96b: errors: morph reportsimilar() into similarity_hint().Nov 20 2020, 9:50 PM
Closed by commit rHGbb1b7a5bc96b: errors: morph reportsimilar() into similarity_hint() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (2 lines)
Mmercurial/scmutil.py (12 lines)

Diff 23581

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