Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: always show command help with -h (issue4240) stable
authorMatt Mackall <mpm@selenic.com>
Thu, 31 Jul 2014 14:31:31 -0500
branchstable
changeset 21961 af15de6775c7
parent 21960 2896d450fec4
child 21963 315cb6f5156a
help: always show command help with -h (issue4240) Old behavior: hg help x hg x -h hg help -e x hg help -c x config topic topic (!) - cmd showconfig cmd topic (!) - cmd rebase cmd cmd ext cmd New behavior: hg help x hg x -h hg help -e x hg help -c x config topic cmd - cmd showconfig cmd cmd - cmd rebase cmd cmd ext cmd
mercurial/dispatch.py file | annotate | diff | comparison | revisions
tests/test-help.t file | annotate | diff | comparison | revisions 
--- a/mercurial/dispatch.py	Fri Aug 01 02:14:24 2014 +0900
+++ b/mercurial/dispatch.py	Thu Jul 31 14:31:31 2014 -0500
@@ -766,7 +766,7 @@
     if options['version']:
         return commands.version_(ui)
     if options['help']:
-        return commands.help_(ui, cmd)
+        return commands.help_(ui, cmd, command=True)
     elif not cmd:
         return commands.help_(ui, 'shortlist')
 
--- a/tests/test-help.t	Fri Aug 01 02:14:24 2014 +0900
+++ b/tests/test-help.t	Thu Jul 31 14:31:31 2014 -0500
@@ -862,6 +862,17 @@
   *"hg -v help debugoptDEP"* (glob)
 #endif
 
+Test commands that collide with topics (issue4240)
+
+  $ hg config -hq
+  hg config [-u] [NAME]...
+  
+  show combined config settings from all hgrc files
+  $ hg showconfig -hq
+  hg config [-u] [NAME]...
+  
+  show combined config settings from all hgrc files
+
 Test a help topic
 
   $ hg help revs
mercurial