Patchwork [2,of,3] help: call filtercmd from topicmatch

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 9, 2015, 7:24 p.m.
Message ID <cb8a737055a013a3c02c.1449689044@waste.org>
Download mbox | patch
Permalink /patch/11953/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 9, 2015, 7:24 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1449688175 0
#      Wed Dec 09 19:09:35 2015 +0000
# Node ID cb8a737055a013a3c02c62825ae074a1af0513a4
# Parent  4fbed691a2eb16e180692a192760cd3669f0ecd3
help: call filtercmd from topicmatch

update test coverage to explicitly define when help -c should
list debug/deprecated items.

Patch

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -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(),
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -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: