changeset 27324:5456374561a7

help: call filtercmd from topicmatch update test coverage to explicitly define when help -c should list debug/deprecated items.
author timeless <timeless@mozdev.org>
date Wed, 09 Dec 2015 19:09:35 +0000
parents 0fe93498ef07
children eadbbd14bdc1
files mercurial/help.py tests/test-help.t
diffstat 2 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/help.py	Wed Dec 09 19:09:06 2015 +0000
+++ b/mercurial/help.py	Wed Dec 09 19:09:35 2015 +0000
@@ -124,6 +124,8 @@
             if doclines:
                 summary = doclines[0]
             cmdname = cmd.partition('|')[0].lstrip('^')
+            if filtercmd(ui, cmdname, kw, docs):
+                continue
             results['commands'].append((cmdname, summary))
     for name, docs in itertools.chain(
         extensions.enabled(False).iteritems(),
--- a/tests/test-help.t	Wed Dec 09 19:09:06 2015 +0000
+++ b/tests/test-help.t	Wed Dec 09 19:09:35 2015 +0000
@@ -1041,6 +1041,16 @@
       helphook1
       helphook2
 
+help -c should only show debug --debug
+
+  $ hg help -c --debug|grep debug|wc -l|grep '^\s*0\s*$'
+  [1]
+
+help -c should only show deprecated for -v
+
+  $ hg help -c -v|grep DEPRECATED|wc -l|grep '^\s*0\s*$'
+  [1]
+
 Test -e / -c / -k combinations
 
   $ hg help -c schemes
@@ -1083,12 +1093,10 @@
   
   Commands:
   
-   bookmarks                    create a new bookmark or list existing bookmarks
-   clone                        make a copy of an existing repository
-   debugapplystreamclonebundle  apply a stream clone bundle file
-   debugcreatestreamclonebundle create a stream clone bundle file
-   paths                        show aliases for remote repositories
-   update                       update working directory (or switch revisions)
+   bookmarks create a new bookmark or list existing bookmarks
+   clone     make a copy of an existing repository
+   paths     show aliases for remote repositories
+   update    update working directory (or switch revisions)
   
   Extensions: