changeset 13230:827a1cc127bf stable

commands: clarify which aliases "hg help -v" show (issue2572)
author Martin Geisler <mg@aragost.com>
date Wed, 05 Jan 2011 10:47:35 +0100
parents 5d1bb1174047
children b335882c2f21
files mercurial/commands.py tests/test-globalopts.t tests/test-help.t tests/test-mq.t
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Jan 01 18:24:18 2011 -0600
+++ b/mercurial/commands.py	Wed Jan 05 10:47:35 2011 +0100
@@ -1881,7 +1881,7 @@
                 msg = _('use "hg help" for the full list of commands '
                         'or "hg -v" for details')
             elif aliases:
-                msg = _('use "hg -v help%s" to show aliases and '
+                msg = _('use "hg -v help%s" to show builtin aliases and '
                         'global options') % (name and " " + name or "")
             else:
                 msg = _('use "hg -v help %s" to show global options') % name
--- a/tests/test-globalopts.t	Sat Jan 01 18:24:18 2011 -0600
+++ b/tests/test-globalopts.t	Wed Jan 05 10:47:35 2011 +0100
@@ -347,7 +347,7 @@
    hgweb        Configuring hgweb
    glossary     Glossary
   
-  use "hg -v help" to show aliases and global options
+  use "hg -v help" to show builtin aliases and global options
 
   $ hg --help
   Mercurial Distributed SCM
@@ -423,7 +423,7 @@
    hgweb        Configuring hgweb
    glossary     Glossary
   
-  use "hg -v help" to show aliases and global options
+  use "hg -v help" to show builtin aliases and global options
 
 Not tested: --debugger
 
--- a/tests/test-help.t	Sat Jan 01 18:24:18 2011 -0600
+++ b/tests/test-help.t	Wed Jan 05 10:47:35 2011 +0100
@@ -118,7 +118,7 @@
    hgweb        Configuring hgweb
    glossary     Glossary
   
-  use "hg -v help" to show aliases and global options
+  use "hg -v help" to show builtin aliases and global options
 
   $ hg -q help
    add          add the specified files on the next commit
@@ -416,7 +416,7 @@
    add         add the specified files on the next commit
    addremove   add all new files, delete all missing files
   
-  use "hg -v help ad" to show aliases and global options
+  use "hg -v help ad" to show builtin aliases and global options
 
 Test command without options
 
@@ -716,7 +716,7 @@
    hgweb        Configuring hgweb
    glossary     Glossary
   
-  use "hg -v help" to show aliases and global options
+  use "hg -v help" to show builtin aliases and global options
 
 Test list of commands with command with no help text
 
@@ -727,7 +727,7 @@
   
    nohelp   (no help text available)
   
-  use "hg -v help helpext" to show aliases and global options
+  use "hg -v help helpext" to show builtin aliases and global options
 
 Test a help topic
 
--- a/tests/test-mq.t	Sat Jan 01 18:24:18 2011 -0600
+++ b/tests/test-mq.t	Wed Jan 05 10:47:35 2011 +0100
@@ -77,7 +77,7 @@
    qunapplied   print the patches not yet applied
    strip        strip changesets and all their descendants from the repository
   
-  use "hg -v help mq" to show aliases and global options
+  use "hg -v help mq" to show builtin aliases and global options
 
   $ hg init a
   $ cd a