--- a/mercurial/help.py Tue Aug 12 04:00:42 2014 -0500
+++ b/mercurial/help.py Tue Aug 12 04:11:32 2014 -0500
@@ -369,18 +369,19 @@
rst.append('\n%s\n' % optrst(_("global options"),
commands.globalopts, ui.verbose))
if name == 'shortlist':
- rst.append(_('\nuse "hg help" for the full list '
- 'of commands\n'))
+ rst.append(_('\n(use "hg help" for the full list '
+ 'of commands)\n'))
else:
if name == 'shortlist':
- rst.append(_('\nuse "hg help" for the full list of commands '
- 'or "hg -v" for details\n'))
+ rst.append(_('\n(use "hg help" for the full list of commands '
+ 'or "hg -v" for details)\n'))
elif name and not full:
- rst.append(_('\nuse "hg help %s" to show the full help '
- 'text\n') % name)
+ rst.append(_('\n(use "hg help %s" to show the full help '
+ 'text)\n') % name)
else:
- rst.append(_('\nuse "hg -v help%s" to show builtin aliases and '
- 'global options\n') % (name and " " + name or ""))
+ rst.append(_('\n(use "hg help -v%s" to show built-in aliases '
+ 'and global options)\n')
+ % (name and " " + name or ""))
return rst
def helptopic(name):
--- a/tests/test-alias.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-alias.t Tue Aug 12 04:11:32 2014 -0500
@@ -399,7 +399,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
[255]
$ hg --invalid mylog
hg: option --invalid not recognized
@@ -425,7 +425,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
[255]
$ hg --invalid blank
hg: option --invalid not recognized
@@ -451,7 +451,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
[255]
This should show id:
--- a/tests/test-commandserver.py.out Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-commandserver.py.out Tue Aug 12 04:11:32 2014 -0500
@@ -34,7 +34,7 @@
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
+(use "hg help" for the full list of commands or "hg -v" for details)
runcommand id --quiet
000000000000
runcommand id
--- a/tests/test-extension.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-extension.t Tue Aug 12 04:11:32 2014 -0500
@@ -463,7 +463,7 @@
extdiff use external program to diff repository (or selected files)
- use "hg -v help extdiff" to show builtin aliases and global options
+ (use "hg help -v extdiff" to show built-in aliases and global options)
--- a/tests/test-globalopts.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-globalopts.t Tue Aug 12 04:11:32 2014 -0500
@@ -357,7 +357,7 @@
templating Template Usage
urls URL Paths
- use "hg -v help" to show builtin aliases and global options
+ (use "hg help -v" to show built-in aliases and global options)
@@ -439,7 +439,7 @@
templating Template Usage
urls URL Paths
- use "hg -v help" to show builtin aliases and global options
+ (use "hg help -v" to show built-in aliases and global options)
Not tested: --debugger
--- a/tests/test-help.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-help.t Tue Aug 12 04:11:32 2014 -0500
@@ -23,7 +23,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
$ hg -q
add add the specified files on the next commit
@@ -122,7 +122,7 @@
templating Template Usage
urls URL Paths
- use "hg -v help" to show builtin aliases and global options
+ (use "hg help -v" to show built-in aliases and global options)
$ hg -q help
add add the specified files on the next commit
@@ -326,7 +326,7 @@
-h --help display help and exit
--hidden consider hidden changesets
- use "hg help" for the full list of commands
+ (use "hg help" for the full list of commands)
$ hg add -h
hg add [OPTION]... [FILE]...
@@ -441,7 +441,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 builtin aliases and global options
+ (use "hg help -v ad" to show built-in aliases and global options)
Test command without options
@@ -610,7 +610,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
[255]
@@ -744,7 +744,7 @@
templating Template Usage
urls URL Paths
- use "hg -v help" to show builtin aliases and global options
+ (use "hg help -v" to show built-in aliases and global options)
Test list of internal help commands
@@ -806,7 +806,7 @@
debugwireargs
(no help text available)
- use "hg -v help debug" to show builtin aliases and global options
+ (use "hg help -v debug" to show built-in aliases and global options)
Test list of commands with command with no help text
@@ -818,7 +818,7 @@
nohelp (no help text available)
- use "hg -v help helpext" to show builtin aliases and global options
+ (use "hg help -v helpext" to show built-in aliases and global options)
test deprecated option is hidden in command help
--- a/tests/test-mq.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-mq.t Tue Aug 12 04:11:32 2014 -0500
@@ -95,7 +95,7 @@
qtop print the name of the current patch
qunapplied print the patches not yet applied
- use "hg -v help mq" to show builtin aliases and global options
+ (use "hg help -v mq" to show built-in aliases and global options)
$ hg init a
$ cd a
--- a/tests/test-strict.t Tue Aug 12 04:00:42 2014 -0500
+++ b/tests/test-strict.t Tue Aug 12 04:11:32 2014 -0500
@@ -37,7 +37,7 @@
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
+ (use "hg help" for the full list of commands or "hg -v" for details)
[255]
$ hg annotate a
0: a