Similar reasoning as the previous patch.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D4025
dispatch: show a short error message when invalid global option givenClosedPublic
dispatch: show a short error message when invalid global option given
ClosedPublic
Authored by martinvonz on Aug 1 2018, 2:53 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dispatch.py (3 lines) | |||
| M | tests/test-alias.t (72 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Jul 24 2018, 1:47 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
Diff 9725
Diff 9725
mercurial/dispatch.py
| (inst.args[0], " ".join(inst.args[1]))) | (inst.args[0], " ".join(inst.args[1]))) | ||||
| except error.CommandError as inst: | except error.CommandError as inst: | ||||
| if inst.args[0]: | if inst.args[0]: | ||||
| ui.pager('help') | ui.pager('help') | ||||
| msgbytes = pycompat.bytestr(inst.args[1]) | msgbytes = pycompat.bytestr(inst.args[1]) | ||||
| ui.warn(_("hg %s: %s\n") % (inst.args[0], msgbytes)) | ui.warn(_("hg %s: %s\n") % (inst.args[0], msgbytes)) | ||||
| commands.help_(ui, inst.args[0], full=False, command=True) | commands.help_(ui, inst.args[0], full=False, command=True) | ||||
| else: | else: | ||||
| ui.pager('help') | |||||
| ui.warn(_("hg: %s\n") % inst.args[1]) | ui.warn(_("hg: %s\n") % inst.args[1]) | ||||
| commands.help_(ui, 'shortlist') | ui.warn(_("(use 'hg help -v' for a list of global options)\n")) | ||||
| except error.ParseError as inst: | except error.ParseError as inst: | ||||
| _formatparse(ui.warn, inst) | _formatparse(ui.warn, inst) | ||||
| return -1 | return -1 | ||||
| except error.UnknownCommand as inst: | except error.UnknownCommand as inst: | ||||
| nocmdmsg = _("hg: unknown command '%s'\n") % inst.args[0] | nocmdmsg = _("hg: unknown command '%s'\n") % inst.args[0] | ||||
| 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) | ||||
tests/test-alias.t
| (use 'hg rt -h' to show more help) | (use 'hg rt -h' to show more help) | ||||
| [255] | [255] | ||||
| invalid global arguments for normal commands, aliases, and shell aliases | invalid global arguments for normal commands, aliases, and shell aliases | ||||
| $ hg --invalid root | $ hg --invalid root | ||||
| hg: option --invalid not recognized | hg: option --invalid not recognized | ||||
| Mercurial Distributed SCM | (use 'hg help -v' for a list of global options) | ||||
| 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 --invalid mylog | $ hg --invalid mylog | ||||
| hg: option --invalid not recognized | hg: option --invalid not recognized | ||||
| Mercurial Distributed SCM | (use 'hg help -v' for a list of global options) | ||||
| 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 --invalid blank | $ hg --invalid blank | ||||
| hg: option --invalid not recognized | hg: option --invalid not recognized | ||||
| Mercurial Distributed SCM | (use 'hg help -v' for a list of global options) | ||||
| 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] | ||||
| environment variable changes in alias commands | environment variable changes in alias commands | ||||
| $ cat > $TESTTMP/expandalias.py <<EOF | $ cat > $TESTTMP/expandalias.py <<EOF | ||||
| > import os | > import os | ||||
| > from mercurial import cmdutil, commands, registrar | > from mercurial import cmdutil, commands, registrar | ||||
| > cmdtable = {} | > cmdtable = {} | ||||