This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4024

dispatch: don't show list of commands on bogus command
ClosedPublic

Authored by martinvonz on Aug 1 2018, 2:53 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5199c5b6fd29: dispatch: don't show list of commands on bogus command
rHG81fb442187c6: dispatch: don't show list of commands on bogus command
Summary

If a command is ambiguous, you get this:

$ hg ve
hg: command 've' is ambiguous:
    verify version
[255]

If you typo a command, you get this:

$ hg comit
hg: unknown command 'comit'
(did you mean one of commit, incoming, mycommit?)
[255]

But if you completely mistype a command so it no longer looks like any
existing commands, you get a full list of commands. That might be
useful the first time you use Mercurial, but after that it's probably
more annoying than help, especially if you have the pager enabled and
have a short terminal. Let's instead give a short hint telling the
user to run hg help for more help.

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.Aug 1 2018, 2:53 PM
pulkit accepted this revision.Aug 1 2018, 4:45 PM
pulkit added a subscriber: pulkit.

I like this change. Thanks!

Closed by commit rHG81fb442187c6: dispatch: don't show list of commands on bogus command (authored by martinvonz). · Explain WhyAug 1 2018, 5:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9743

mercurial/dispatch.py

suggested = False suggested = False
if len(inst.args) == 2: if len(inst.args) == 2:
sim = _getsimilar(inst.args[1], inst.args[0]) sim = _getsimilar(inst.args[1], inst.args[0])
if sim: if sim:
ui.warn(nocmdmsg) ui.warn(nocmdmsg)
_reportsimilar(ui.warn, sim) _reportsimilar(ui.warn, sim)
suggested = True suggested = True
if not suggested: if not suggested:
ui.pager('help')
ui.warn(nocmdmsg) ui.warn(nocmdmsg)
commands.help_(ui, 'shortlist') ui.warn(_("(use 'hg help' for a list of commands)\n"))
except IOError: except IOError:
raise raise
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except: # probably re-raises except: # probably re-raises
if not handlecommandexception(ui): if not handlecommandexception(ui):
raise raise

tests/test-extension.t

> hgext.mq = ! > hgext.mq = !
> hgext/mq = ! > hgext/mq = !
> EOF > EOF
$ hg deprecatedcmd > /dev/null $ hg deprecatedcmd > /dev/null
*** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo *** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo
*** (use @command decorator to register 'deprecatedcmd') *** (use @command decorator to register 'deprecatedcmd')
hg: unknown command 'deprecatedcmd' hg: unknown command 'deprecatedcmd'
(use 'hg help' for a list of commands)
[255] [255]
the extension shouldn't be loaded at all so the mq works: the extension shouldn't be loaded at all so the mq works:
$ hg qseries --config extensions.mq= > /dev/null $ hg qseries --config extensions.mq= > /dev/null
*** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo *** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo
*** (use @command decorator to register 'deprecatedcmd') *** (use @command decorator to register 'deprecatedcmd')

tests/test-help.t

$ hg help foo $ hg help foo
abort: no such help topic: foo abort: no such help topic: foo
(try 'hg help --keyword foo') (try 'hg help --keyword foo')
[255] [255]
$ hg skjdfks $ hg skjdfks
hg: unknown command 'skjdfks' hg: unknown command 'skjdfks'
Mercurial Distributed SCM (use 'hg help' for a list of commands)
basic commands:
add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
(use 'hg help' for the full list of commands or 'hg -v' for details)
[255] [255]
Typoed command gives suggestion Typoed command gives suggestion
$ hg puls $ hg puls
hg: unknown command 'puls' hg: unknown command 'puls'
(did you mean one of pull, push?) (did you mean one of pull, push?)
[255] [255]

tests/test-status-color.t

$ hg resolve -l $ hg resolve -l
\x1b[0;31;1mU \x1b[0m\x1b[0;31;1ma\x1b[0m (esc) \x1b[0;31;1mU \x1b[0m\x1b[0;31;1ma\x1b[0m (esc)
\x1b[0;32;1mR \x1b[0m\x1b[0;32;1mb\x1b[0m (esc) \x1b[0;32;1mR \x1b[0m\x1b[0;32;1mb\x1b[0m (esc)
color coding of error message with current availability of curses color coding of error message with current availability of curses
$ hg unknowncommand > /dev/null $ hg unknowncommand > /dev/null
hg: unknown command 'unknowncommand' hg: unknown command 'unknowncommand'
(use 'hg help' for a list of commands)
[255] [255]
color coding of error message without curses color coding of error message without curses
$ echo 'raise ImportError' > curses.py $ echo 'raise ImportError' > curses.py
$ PYTHONPATH=`pwd`:$PYTHONPATH hg unknowncommand > /dev/null $ PYTHONPATH=`pwd`:$PYTHONPATH hg unknowncommand > /dev/null
hg: unknown command 'unknowncommand' hg: unknown command 'unknowncommand'
(use 'hg help' for a list of commands)
[255] [255]
$ cd .. $ cd ..

tests/test-strict.t

$ hg --config ui.strict=False an a $ hg --config ui.strict=False an a
0: a 0: a
$ echo "[ui]" >> $HGRCPATH $ echo "[ui]" >> $HGRCPATH
$ echo "strict=True" >> $HGRCPATH $ echo "strict=True" >> $HGRCPATH
$ hg an a $ hg an a
hg: unknown command 'an' hg: unknown command 'an'
Mercurial Distributed SCM (use 'hg help' for a list of commands)
basic commands:
add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
(use 'hg help' for the full list of commands or 'hg -v' for details)
[255] [255]
$ hg annotate a $ hg annotate a
0: a 0: a
should succeed - up is an alias, not an abbreviation should succeed - up is an alias, not an abbreviation
$ hg up $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved