test-help: improve test coverage

Adds a test for using the help option with the version option.

Extends test coverage of commands.help_ by another 2 lines.

tests/test-help

@@ -1,19 +1,23 b''
 #!/bin/sh
 
 hg
 hg -q
 hg help
 hg -q help
 
 echo %% test short command list with verbose option
 hg -v help shortlist | sed 's/[(]version [^)]*[)]/(version xxx)/'
 
 hg add -h
+
+echo %% test help option with version option
+hg add -h --version | sed 's/[(]version [^)]*[)]/(version xxx)/'
+
 hg add --skjdfks
 hg help diff
 hg help status
 hg -q help status
 hg help foo
 hg skjdfks
 
 exit 0

tests/test-help.out

@@ -1,419 +1,444 b''
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      export the repository via HTTP
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory
 
 use "hg help" for the full list of commands or "hg -v" for details
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      export the repository via HTTP
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory
 Mercurial Distributed SCM
 
 list of commands:
 
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      retry file merges from a merge or update
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working directory
  serve        export the repository via HTTP
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
 
 use "hg -v help" to show aliases and global options
  add          add the specified files on the next commit
  addremove    add all new files, delete all missing files
  annotate     show changeset information by line for each file
  archive      create an unversioned archive of a repository revision
  backout      reverse effect of earlier changeset
  bisect       subdivision search of changesets
  branch       set or show the current branch name
  branches     list repository named branches
  bundle       create a changegroup file
  cat          output the current or given revision of files
  clone        make a copy of an existing repository
  commit       commit the specified files or all outstanding changes
  copy         mark files as copied for the next commit
  diff         diff repository (or selected files)
  export       dump the header and diffs for one or more changesets
  forget       forget the specified files on the next commit
  grep         search for a pattern in specified files and revisions
  heads        show current repository heads or show branch heads
  help         show help for a given topic or a help overview
  identify     identify the working copy or specified revision
  import       import an ordered set of patches
  incoming     show new changesets found in source
  init         create a new repository in the given directory
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
  outgoing     show changesets not found in destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
  push         push changes to the specified destination
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
  resolve      retry file merges from a merge or update
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working directory
  serve        export the repository via HTTP
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
  summary      summarize working directory state
  tag          add one or more tags for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply one or more changegroup files
  update       update working directory
  verify       verify the integrity of the repository
  version      output version and copyright information
 
 additional help topics:
 
  config       Configuration Files
  dates        Date Formats
  patterns     File Name Patterns
  environment  Environment Variables
  revisions    Specifying Single Revisions
  multirevs    Specifying Multiple Revisions
  diffs        Diff Formats
  templating   Template Usage
  urls         URL Paths
  extensions   Using additional features
 %% test short command list with verbose option
 Mercurial Distributed SCM (version xxx)
 
 Copyright (C) 2005-2009 Matt Mackall <[e-mail]> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 basic commands:
 
  add:
       add the specified files on the next commit
  annotate, blame:
       show changeset information by line for each file
  clone:
       make a copy of an existing repository
  commit, ci:
       commit the specified files or all outstanding changes
  diff:
       diff repository (or selected files)
  export:
       dump the header and diffs for one or more changesets
  forget:
       forget the specified files on the next commit
  init:
       create a new repository in the given directory
  log, history:
       show revision history of entire repository or files
  merge:
       merge working directory with another revision
  pull:
       pull changes from the specified source
  push:
       push changes to the specified destination
  remove, rm:
       remove the specified files on the next commit
  serve:
       export the repository via HTTP
  status, st:
       show changed files in the working directory
  summary, sum:
       summarize working directory state
  update, up, checkout, co:
       update working directory
 
 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
     --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
 
 use "hg help" for the full list of commands
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see hg forget.
 
     If no names are given, add all files to the repository.
 
 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
 
 use "hg -v help add" to show global options
+%% test help option with version option
+Mercurial Distributed SCM (version xxx)
+
+Copyright (C) 2005-2009 Matt Mackall <[e-mail]> and others
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+hg add [OPTION]... [FILE]...
+
+add the specified files on the next commit
+
+    Schedule files to be version controlled and added to the repository.
+
+    The files will be added to the repository at the next commit. To undo an
+    add before that, see hg forget.
+
+    If no names are given, add all files to the repository.
+
+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
+
+use "hg -v help add" to show global options
 hg add: option --skjdfks not recognized
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
     Schedule files to be version controlled and added to the repository.
 
     The files will be added to the repository at the next commit. To undo an
     add before that, see hg forget.
 
     If no names are given, add all files to the repository.
 
 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
 
 use "hg -v help add" to show global options
 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
 
 diff repository (or selected files)
 
     Show differences between revisions for the specified files.
 
     Differences between files are shown using the unified diff format.
 
     NOTE: diff may generate unexpected results for merges, as it will default
     to comparing against the working directory's first parent changeset if no
     revisions are specified.
 
     When two revision arguments are given, then changes are shown between
     those revisions. If only one revision is specified then that revision is
     compared to the working directory, and, when no revisions are specified,
     the working directory files are compared to its parent.
 
     Without the -a/--text option, diff will avoid generating diffs of files it
     detects as binary. With -a, diff will generate a diff anyway, probably
     with undesirable results.
 
     Use the -g/--git option to generate diffs in the git extended diff format.
     For more information, read 'hg help diffs'.
 
 options:
 
  -r --rev                  revision
  -c --change               change made by revision
  -a --text                 treat all files as text
  -g --git                  use git extended diff format
     --nodates              don't include dates in diff headers
  -p --show-function        show which function each change is in
     --reverse              produce a diff that undoes the changes
  -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
     --stat                 output diffstat-style summary of changes
  -I --include              include names matching the given patterns
  -X --exclude              exclude names matching the given patterns
 
 use "hg -v help diff" to show global options
 hg status [OPTION]... [FILE]...
 
 aliases: st
 
 show changed files in the working directory
 
     Show status of files in the repository. If names are given, only files
     that match are shown. Files that are clean or ignored or the source of a
     copy/move operation, are not listed unless -c/--clean, -i/--ignored,
     -C/--copies or -A/--all are given. Unless options described with "show
     only ..." are given, the options -mardu are used.
 
     Option -q/--quiet hides untracked (unknown and ignored) files unless
     explicitly requested with -u/--unknown or -i/--ignored.
 
     NOTE: status may appear to disagree with diff if permissions have changed
     or a merge has occurred. The standard diff format does not report
     permission changes and diff only reports changes relative to one merge
     parent.
 
     If one revision is given, it is used as the base revision. If two
     revisions are given, the differences between them are shown. The --change
     option can also be used as a shortcut to list the changed files of a
     revision from its first parent.
 
     The codes used to show the status of files are:
 
       M = modified
       A = added
       R = removed
       C = clean
       ! = missing (deleted by non-hg command, but still tracked)
       ? = not tracked
       I = ignored
         = origin of the previous file listed as A (added)
 
 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
 
 use "hg -v help status" to show global options
 hg status [OPTION]... [FILE]...
 
 show changed files in the working directory
 hg: unknown command 'foo'
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      export the repository via HTTP
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory
 
 use "hg help" for the full list of commands or "hg -v" for details
 hg: unknown command 'skjdfks'
 Mercurial Distributed SCM
 
 basic commands:
 
  add        add the specified files on the next commit
  annotate   show changeset information by line for each file
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff repository (or selected files)
  export     dump the header and diffs for one or more changesets
  forget     forget the specified files on the next commit
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  serve      export the repository via HTTP
  status     show changed files in the working directory
  summary    summarize working directory state
  update     update working directory
 
 use "hg help" for the full list of commands or "hg -v" for details