This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9343

errors: restructure formatparse() to clarify conditions a bit
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG7a273336d3d3: errors: restructure formatparse() to clarify conditions a bit
Summary

The similar list will be calculated only for
error.UnknownIdentifier. It was then printed only if `inst.location
is None`, which is true for that exception type, but it's an indirect
condition to rely on.

Also, it looked from the code like it could both report similarities
and print a hint. That would be a little awkward because the
similarity report looks similar to the hint (both are printed within
parentheses). I also added a elif to clarify that. I plan to
refactor this more coming patches so the similarity report actually is
a hint.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (9 lines)

Diff 23594

mercurial/scmutil.py

if len(similar) == 1: if len(similar) == 1:
write(_(b"(did you mean %s?)\n") % similar[0]) write(_(b"(did you mean %s?)\n") % 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) write(_(b"(did you mean one of %s?)\n") % ss)
def formatparse(write, inst): def formatparse(write, inst):
similar = []
if isinstance(inst, error.UnknownIdentifier):
# make sure to check fileset first, as revset can invoke fileset
similar = getsimilar(inst.symbols, inst.function)
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):
# make sure to check fileset first, as revset can invoke fileset
similar = getsimilar(inst.symbols, inst.function)
reportsimilar(write, similar) reportsimilar(write, similar)
if 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
and return an exit code accordingly. does not handle all exceptions. and return an exit code accordingly. does not handle all exceptions.