diff tests/test-help.out @ 11321:40c06bbf58be

help: show value requirement and multiple occurrence of options

this helps users to know what kind of option is:

  - no value is required(flag option)
  - value is required
  - value is required, and multiple occurrences are allowed

each kinds are shown as below:

 -f --force              force push
 -e --ssh CMD            specify ssh command to use
 -b --branch BRANCH [+]  a specific branch you would like to push

if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.

--- a/tests/test-help.out	Wed Jun 09 12:45:48 2010 +0100
+++ b/tests/test-help.out	Sun Jun 06 17:25:00 2010 +0900
@@ -217,21 +217,24 @@
       update working directory (or switch revisions)
 
 global options:
- -R --repository      repository root directory or name of overlay bundle file
-    --cwd             change working directory
- -y --noninteractive  do not prompt, assume 'yes' for any required answers
- -q --quiet           suppress output
- -v --verbose         enable additional output
-    --config          set/override config option (use 'section.name=value')
-    --debug           enable debugging output
-    --debugger        start debugger
-    --encoding        set the charset encoding (default: ascii)
-    --encodingmode    set the charset encoding mode (default: strict)
-    --traceback       always print a traceback on exception
-    --time            time how long the command takes
-    --profile         print command execution profile
-    --version         output version information and exit
- -h --help            display help and exit
+ -R --repository REPO    repository root directory or name of overlay bundle
+                         file
+    --cwd DIR            change working directory
+ -y --noninteractive     do not prompt, assume 'yes' for any required answers
+ -q --quiet              suppress output
+ -v --verbose            enable additional output
+    --config CONFIG [+]  set/override config option (use 'section.name=value')
+    --debug              enable debugging output
+    --debugger           start debugger
+    --encoding ENCODE    set the charset encoding (default: ascii)
+    --encodingmode MODE  set the charset encoding mode (default: strict)
+    --traceback          always print a traceback on exception
+    --time               time how long the command takes
+    --profile            print command execution profile
+    --version            output version information and exit
+ -h --help               display help and exit
+
+[+] marked option can be specified multiple times
 
 use "hg help" for the full list of commands
 hg add [OPTION]... [FILE]...
@@ -249,9 +252,11 @@
 
 options:
 
- -I --include  include names matching the given patterns
- -X --exclude  exclude names matching the given patterns
- -n --dry-run  do not perform actions, just print output
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+ -n --dry-run              do not perform actions, just print output
+
+[+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 %% verbose help for add
@@ -280,26 +285,31 @@
 
 options:
 
- -I --include         include names matching the given patterns
- -X --exclude         exclude names matching the given patterns
- -n --dry-run         do not perform actions, just print output
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+ -n --dry-run              do not perform actions, just print output
 
 global options:
- -R --repository      repository root directory or name of overlay bundle file
-    --cwd             change working directory
- -y --noninteractive  do not prompt, assume 'yes' for any required answers
- -q --quiet           suppress output
- -v --verbose         enable additional output
-    --config          set/override config option (use 'section.name=value')
-    --debug           enable debugging output
-    --debugger        start debugger
-    --encoding        set the charset encoding (default: ascii)
-    --encodingmode    set the charset encoding mode (default: strict)
-    --traceback       always print a traceback on exception
-    --time            time how long the command takes
-    --profile         print command execution profile
-    --version         output version information and exit
- -h --help            display help and exit
+ -R --repository REPO      repository root directory or name of overlay bundle
+                           file
+    --cwd DIR              change working directory
+ -y --noninteractive       do not prompt, assume 'yes' for any required
+                           answers
+ -q --quiet                suppress output
+ -v --verbose              enable additional output
+    --config CONFIG [+]    set/override config option (use
+                           'section.name=value')
+    --debug                enable debugging output
+    --debugger             start debugger
+    --encoding ENCODE      set the charset encoding (default: ascii)
+    --encodingmode MODE    set the charset encoding mode (default: strict)
+    --traceback            always print a traceback on exception
+    --time                 time how long the command takes
+    --profile              print command execution profile
+    --version              output version information and exit
+ -h --help                 display help and exit
+
+[+] marked option can be specified multiple times
 %% test help option with version option
 Mercurial Distributed SCM (version xxx)
 
@@ -322,9 +332,11 @@
 
 options:
 
- -I --include  include names matching the given patterns
- -X --exclude  exclude names matching the given patterns
- -n --dry-run  do not perform actions, just print output
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+ -n --dry-run              do not perform actions, just print output
+
+[+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 hg add: option --skjdfks not recognized
@@ -343,9 +355,11 @@
 
 options:
 
- -I --include  include names matching the given patterns
- -X --exclude  exclude names matching the given patterns
- -n --dry-run  do not perform actions, just print output
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+ -n --dry-run              do not perform actions, just print output
+
+[+] marked option can be specified multiple times
 
 use "hg -v help add" to show global options
 %% test ambiguous command help
@@ -401,8 +415,8 @@
 
 options:
 
- -r --rev                  revision
- -c --change               change made by revision
+ -r --rev REV [+]          revision
+ -c --change REV           change made by revision
  -a --text                 treat all files as text
  -g --git                  use git extended diff format
     --nodates              omit dates from diff headers
@@ -411,10 +425,12 @@
  -w --ignore-all-space     ignore white space when comparing lines
  -b --ignore-space-change  ignore changes in the amount of white space
  -B --ignore-blank-lines   ignore changes whose lines are all blank
- -U --unified              number of lines of context to show
+ -U --unified NUM          number of lines of context to show
     --stat                 output diffstat-style summary of changes
- -I --include              include names matching the given patterns
- -X --exclude              exclude names matching the given patterns
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+
+[+] marked option can be specified multiple times
 
 use "hg -v help diff" to show global options
 hg status [OPTION]... [FILE]...
@@ -457,21 +473,23 @@
 
 options:
 
- -A --all        show status of all files
- -m --modified   show only modified files
- -a --added      show only added files
- -r --removed    show only removed files
- -d --deleted    show only deleted (but tracked) files
- -c --clean      show only files without changes
- -u --unknown    show only unknown (not tracked) files
- -i --ignored    show only ignored files
- -n --no-status  hide status prefix
- -C --copies     show source of copied files
- -0 --print0     end filenames with NUL, for use with xargs
-    --rev        show difference from revision
-    --change     list the changed files of a revision
- -I --include    include names matching the given patterns
- -X --exclude    exclude names matching the given patterns
+ -A --all                  show status of all files
+ -m --modified             show only modified files
+ -a --added                show only added files
+ -r --removed              show only removed files
+ -d --deleted              show only deleted (but tracked) files
+ -c --clean                show only files without changes
+ -u --unknown              show only unknown (not tracked) files
+ -i --ignored              show only ignored files
+ -n --no-status            hide status prefix
+ -C --copies               show source of copied files
+ -0 --print0               end filenames with NUL, for use with xargs
+    --rev REV [+]          show difference from revision
+    --change REV           list the changed files of a revision
+ -I --include PATTERN [+]  include names matching the given patterns
+ -X --exclude PATTERN [+]  exclude names matching the given patterns
+
+[+] marked option can be specified multiple times
 
 use "hg -v help status" to show global options
 hg status [OPTION]... [FILE]...