help: fix column alignment in "hg help" output

The output of "hg help" is changed to ensure that the column containing
descriptions of commands, extensions, and other topics is correctly alignmened.

mercurial/commands.py

@@ -3155,7 +3155,7 b' def help_(ui, name=None, unknowncmd=Fals'
                 ui.write(" %s:\n      %s\n"%(commands, h[f]))
             else:
                 ui.write('%s\n' % (util.wrap(h[f], textwidth,
-                                             initindent=' %-*s   ' % (m, f),
+                                             initindent=' %-*s    ' % (m, f),
                                              hangindent=' ' * (m + 4))))
 
         if not name:
@@ -3169,7 +3169,7 b' def help_(ui, name=None, unknowncmd=Fals'
                 topics.append((sorted(names, key=len, reverse=True)[0], header))
             topics_len = max([len(s[0]) for s in topics])
             for t, desc in topics:
-                ui.write(" %-*s  %s\n" % (topics_len, t, desc))
+                ui.write(" %-*s   %s\n" % (topics_len, t, desc))
 
         optlist = []
         addglobalopts(optlist, True)

tests/test-alias.t

@@ -324,24 +324,24 b' invalid global arguments for normal comm'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]
@@ -351,24 +351,24 b' invalid global arguments for normal comm'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]
@@ -378,24 +378,24 b' invalid global arguments for normal comm'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]

tests/test-commandserver.py.out

@@ -16,24 +16,24 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
- phase      set or show the current phase name
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- serve      start stand-alone webserver
- status     show changed files in the working directory
- summary    summarize working directory state
- update     update working directory (or switch revisions)
+ 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
+ phase       set or show the current phase name
+ pull        pull changes from the specified source
+ push        push changes to the specified destination
+ remove      remove the specified files on the next commit
+ serve       start stand-alone webserver
+ status      show changed files in the working directory
+ 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
  runcommand id --quiet

tests/test-extension.t

@@ -327,7 +327,7 b' Extension module help vs command help:'
   
   list of commands:
   
-   extdiff   use external program to diff repository (or selected files)
+   extdiff    use external program to diff repository (or selected files)
   
   use "hg -v help extdiff" to show builtin aliases and global options
 

tests/test-globalopts.t

@@ -279,79 +279,79 b' Testing -h/--help:'
   
   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
-   bookmarks    track a line of development with movable markers
-   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
-   graft        copy changes from other branches onto the current branch
-   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 the destination
-   parents      show the parents of the working directory or revision
-   paths        show aliases for remote repositories
-   phase        set or show the current phase name
-   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      redo merges or set/view the merge status of files
-   revert       restore files to their checkout state
-   rollback     roll back the last transaction (dangerous)
-   root         print the root (top) of the current working directory
-   serve        start stand-alone webserver
-   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 (or switch revisions)
-   verify       verify the integrity of the repository
-   version      output version and copyright information
+   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
+   bookmarks     track a line of development with movable markers
+   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
+   graft         copy changes from other branches onto the current branch
+   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 the destination
+   parents       show the parents of the working directory or revision
+   paths         show aliases for remote repositories
+   phase         set or show the current phase name
+   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       redo merges or set/view the merge status of files
+   revert        restore files to their checkout state
+   rollback      roll back the last transaction (dangerous)
+   root          print the root (top) of the current working directory
+   serve         start stand-alone webserver
+   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 (or switch revisions)
+   verify        verify the integrity of the repository
+   version       output version and copyright information
   
   additional help topics:
   
-   config       Configuration Files
-   dates        Date Formats
-   diffs        Diff Formats
-   environment  Environment Variables
-   extensions   Using additional features
-   filesets     Specifying File Sets
-   glossary     Glossary
-   hgignore     syntax for Mercurial ignore files
-   hgweb        Configuring hgweb
-   merge-tools  Merge Tools
-   multirevs    Specifying Multiple Revisions
-   patterns     File Name Patterns
-   revisions    Specifying Single Revisions
-   revsets      Specifying Revision Sets
-   subrepos     Subrepositories
-   templating   Template Usage
-   urls         URL Paths
+   config        Configuration Files
+   dates         Date Formats
+   diffs         Diff Formats
+   environment   Environment Variables
+   extensions    Using additional features
+   filesets      Specifying File Sets
+   glossary      Glossary
+   hgignore      syntax for Mercurial ignore files
+   hgweb         Configuring hgweb
+   merge-tools   Merge Tools
+   multirevs     Specifying Multiple Revisions
+   patterns      File Name Patterns
+   revisions     Specifying Single Revisions
+   revsets       Specifying Revision Sets
+   subrepos      Subrepositories
+   templating    Template Usage
+   urls          URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
@@ -362,79 +362,79 b' Testing -h/--help:'
   
   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
-   bookmarks    track a line of development with movable markers
-   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
-   graft        copy changes from other branches onto the current branch
-   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 the destination
-   parents      show the parents of the working directory or revision
-   paths        show aliases for remote repositories
-   phase        set or show the current phase name
-   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      redo merges or set/view the merge status of files
-   revert       restore files to their checkout state
-   rollback     roll back the last transaction (dangerous)
-   root         print the root (top) of the current working directory
-   serve        start stand-alone webserver
-   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 (or switch revisions)
-   verify       verify the integrity of the repository
-   version      output version and copyright information
+   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
+   bookmarks     track a line of development with movable markers
+   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
+   graft         copy changes from other branches onto the current branch
+   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 the destination
+   parents       show the parents of the working directory or revision
+   paths         show aliases for remote repositories
+   phase         set or show the current phase name
+   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       redo merges or set/view the merge status of files
+   revert        restore files to their checkout state
+   rollback      roll back the last transaction (dangerous)
+   root          print the root (top) of the current working directory
+   serve         start stand-alone webserver
+   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 (or switch revisions)
+   verify        verify the integrity of the repository
+   version       output version and copyright information
   
   additional help topics:
   
-   config       Configuration Files
-   dates        Date Formats
-   diffs        Diff Formats
-   environment  Environment Variables
-   extensions   Using additional features
-   filesets     Specifying File Sets
-   glossary     Glossary
-   hgignore     syntax for Mercurial ignore files
-   hgweb        Configuring hgweb
-   merge-tools  Merge Tools
-   multirevs    Specifying Multiple Revisions
-   patterns     File Name Patterns
-   revisions    Specifying Single Revisions
-   revsets      Specifying Revision Sets
-   subrepos     Subrepositories
-   templating   Template Usage
-   urls         URL Paths
+   config        Configuration Files
+   dates         Date Formats
+   diffs         Diff Formats
+   environment   Environment Variables
+   extensions    Using additional features
+   filesets      Specifying File Sets
+   glossary      Glossary
+   hgignore      syntax for Mercurial ignore files
+   hgweb         Configuring hgweb
+   merge-tools   Merge Tools
+   multirevs     Specifying Multiple Revisions
+   patterns      File Name Patterns
+   revisions     Specifying Single Revisions
+   revsets       Specifying Revision Sets
+   subrepos      Subrepositories
+   templating    Template Usage
+   urls          URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 

tests/test-help.t

@@ -5,202 +5,202 b' Short help:'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
 
   $ hg -q
-   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   summary     summarize working directory state
+   update      update working directory (or switch revisions)
 
   $ hg help
   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
-   bookmarks    track a line of development with movable markers
-   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
-   graft        copy changes from other branches onto the current branch
-   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 the destination
-   parents      show the parents of the working directory or revision
-   paths        show aliases for remote repositories
-   phase        set or show the current phase name
-   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      redo merges or set/view the merge status of files
-   revert       restore files to their checkout state
-   rollback     roll back the last transaction (dangerous)
-   root         print the root (top) of the current working directory
-   serve        start stand-alone webserver
-   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 (or switch revisions)
-   verify       verify the integrity of the repository
-   version      output version and copyright information
+   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
+   bookmarks     track a line of development with movable markers
+   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
+   graft         copy changes from other branches onto the current branch
+   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 the destination
+   parents       show the parents of the working directory or revision
+   paths         show aliases for remote repositories
+   phase         set or show the current phase name
+   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       redo merges or set/view the merge status of files
+   revert        restore files to their checkout state
+   rollback      roll back the last transaction (dangerous)
+   root          print the root (top) of the current working directory
+   serve         start stand-alone webserver
+   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 (or switch revisions)
+   verify        verify the integrity of the repository
+   version       output version and copyright information
   
   additional help topics:
   
-   config       Configuration Files
-   dates        Date Formats
-   diffs        Diff Formats
-   environment  Environment Variables
-   extensions   Using additional features
-   filesets     Specifying File Sets
-   glossary     Glossary
-   hgignore     syntax for Mercurial ignore files
-   hgweb        Configuring hgweb
-   merge-tools  Merge Tools
-   multirevs    Specifying Multiple Revisions
-   patterns     File Name Patterns
-   revisions    Specifying Single Revisions
-   revsets      Specifying Revision Sets
-   subrepos     Subrepositories
-   templating   Template Usage
-   urls         URL Paths
+   config        Configuration Files
+   dates         Date Formats
+   diffs         Diff Formats
+   environment   Environment Variables
+   extensions    Using additional features
+   filesets      Specifying File Sets
+   glossary      Glossary
+   hgignore      syntax for Mercurial ignore files
+   hgweb         Configuring hgweb
+   merge-tools   Merge Tools
+   multirevs     Specifying Multiple Revisions
+   patterns      File Name Patterns
+   revisions     Specifying Single Revisions
+   revsets       Specifying Revision Sets
+   subrepos      Subrepositories
+   templating    Template Usage
+   urls          URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
   $ hg -q help
-   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
-   bookmarks    track a line of development with movable markers
-   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
-   graft        copy changes from other branches onto the current branch
-   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 the destination
-   parents      show the parents of the working directory or revision
-   paths        show aliases for remote repositories
-   phase        set or show the current phase name
-   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      redo merges or set/view the merge status of files
-   revert       restore files to their checkout state
-   rollback     roll back the last transaction (dangerous)
-   root         print the root (top) of the current working directory
-   serve        start stand-alone webserver
-   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 (or switch revisions)
-   verify       verify the integrity of the repository
-   version      output version and copyright information
+   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
+   bookmarks     track a line of development with movable markers
+   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
+   graft         copy changes from other branches onto the current branch
+   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 the destination
+   parents       show the parents of the working directory or revision
+   paths         show aliases for remote repositories
+   phase         set or show the current phase name
+   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       redo merges or set/view the merge status of files
+   revert        restore files to their checkout state
+   rollback      roll back the last transaction (dangerous)
+   root          print the root (top) of the current working directory
+   serve         start stand-alone webserver
+   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 (or switch revisions)
+   verify        verify the integrity of the repository
+   version       output version and copyright information
   
   additional help topics:
   
-   config       Configuration Files
-   dates        Date Formats
-   diffs        Diff Formats
-   environment  Environment Variables
-   extensions   Using additional features
-   filesets     Specifying File Sets
-   glossary     Glossary
-   hgignore     syntax for Mercurial ignore files
-   hgweb        Configuring hgweb
-   merge-tools  Merge Tools
-   multirevs    Specifying Multiple Revisions
-   patterns     File Name Patterns
-   revisions    Specifying Single Revisions
-   revsets      Specifying Revision Sets
-   subrepos     Subrepositories
-   templating   Template Usage
-   urls         URL Paths
+   config        Configuration Files
+   dates         Date Formats
+   diffs         Diff Formats
+   environment   Environment Variables
+   extensions    Using additional features
+   filesets      Specifying File Sets
+   glossary      Glossary
+   hgignore      syntax for Mercurial ignore files
+   hgweb         Configuring hgweb
+   merge-tools   Merge Tools
+   multirevs     Specifying Multiple Revisions
+   patterns      File Name Patterns
+   revisions     Specifying Single Revisions
+   revsets       Specifying Revision Sets
+   subrepos      Subrepositories
+   templating    Template Usage
+   urls          URL Paths
 
 Test short command list with verbose option
 
@@ -387,8 +387,8 b' Test ambiguous command help'
   $ hg help ad
   list of commands:
   
-   add         add the specified files on the next commit
-   addremove   add all new files, delete all missing files
+   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
 
@@ -537,24 +537,24 b' Test command without options'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]
@@ -565,24 +565,24 b' Test command without options'
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]
@@ -619,59 +619,59 b' Test that default list of commands omits'
   
   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
-   bookmarks    track a line of development with movable markers
-   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
-   graft        copy changes from other branches onto the current branch
-   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 the destination
-   parents      show the parents of the working directory or revision
-   paths        show aliases for remote repositories
-   phase        set or show the current phase name
-   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      redo merges or set/view the merge status of files
-   revert       restore files to their checkout state
-   rollback     roll back the last transaction (dangerous)
-   root         print the root (top) of the current working directory
-   serve        start stand-alone webserver
-   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 (or switch revisions)
-   verify       verify the integrity of the repository
-   version      output version and copyright information
+   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
+   bookmarks     track a line of development with movable markers
+   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
+   graft         copy changes from other branches onto the current branch
+   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 the destination
+   parents       show the parents of the working directory or revision
+   paths         show aliases for remote repositories
+   phase         set or show the current phase name
+   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       redo merges or set/view the merge status of files
+   revert        restore files to their checkout state
+   rollback      roll back the last transaction (dangerous)
+   root          print the root (top) of the current working directory
+   serve         start stand-alone webserver
+   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 (or switch revisions)
+   verify        verify the integrity of the repository
+   version       output version and copyright information
   
   enabled extensions:
   
@@ -679,23 +679,23 b' Test that default list of commands omits'
   
   additional help topics:
   
-   config       Configuration Files
-   dates        Date Formats
-   diffs        Diff Formats
-   environment  Environment Variables
-   extensions   Using additional features
-   filesets     Specifying File Sets
-   glossary     Glossary
-   hgignore     syntax for Mercurial ignore files
-   hgweb        Configuring hgweb
-   merge-tools  Merge Tools
-   multirevs    Specifying Multiple Revisions
-   patterns     File Name Patterns
-   revisions    Specifying Single Revisions
-   revsets      Specifying Revision Sets
-   subrepos     Subrepositories
-   templating   Template Usage
-   urls         URL Paths
+   config        Configuration Files
+   dates         Date Formats
+   diffs         Diff Formats
+   environment   Environment Variables
+   extensions    Using additional features
+   filesets      Specifying File Sets
+   glossary      Glossary
+   hgignore      syntax for Mercurial ignore files
+   hgweb         Configuring hgweb
+   merge-tools   Merge Tools
+   multirevs     Specifying Multiple Revisions
+   patterns      File Name Patterns
+   revisions     Specifying Single Revisions
+   revsets       Specifying Revision Sets
+   subrepos      Subrepositories
+   templating    Template Usage
+   urls          URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
@@ -708,7 +708,7 b' Test list of commands with command with '
   
   list of commands:
   
-   nohelp   (no help text available)
+   nohelp    (no help text available)
   
   use "hg -v help helpext" to show builtin aliases and global options
 

tests/test-mq.t

@@ -55,29 +55,29 b' help'
   
   list of commands:
   
-   qapplied     print the patches already applied
-   qclone       clone main and patch repository at same time
-   qdelete      remove patches from queue
-   qdiff        diff of the current patch and subsequent modifications
-   qfinish      move applied patches into repository history
-   qfold        fold the named patches into the current patch
-   qgoto        push or pop patches until named patch is at top of stack
-   qguard       set or print guards for a patch
-   qheader      print the header of the topmost or specified patch
-   qimport      import a patch
-   qnew         create a new patch
-   qnext        print the name of the next patch
-   qpop         pop the current patch off the stack
-   qprev        print the name of the previous patch
-   qpush        push the next patch onto the stack
-   qqueue       manage multiple patch queues
-   qrefresh     update the current patch
-   qrename      rename a patch
-   qselect      set or print guarded patches to push
-   qseries      print the entire series file
-   qtop         print the name of the current patch
-   qunapplied   print the patches not yet applied
-   strip        strip changesets and all their descendants from the repository
+   qapplied      print the patches already applied
+   qclone        clone main and patch repository at same time
+   qdelete       remove patches from queue
+   qdiff         diff of the current patch and subsequent modifications
+   qfinish       move applied patches into repository history
+   qfold         fold the named patches into the current patch
+   qgoto         push or pop patches until named patch is at top of stack
+   qguard        set or print guards for a patch
+   qheader       print the header of the topmost or specified patch
+   qimport       import a patch
+   qnew          create a new patch
+   qnext         print the name of the next patch
+   qpop          pop the current patch off the stack
+   qprev         print the name of the previous patch
+   qpush         push the next patch onto the stack
+   qqueue        manage multiple patch queues
+   qrefresh      update the current patch
+   qrename       rename a patch
+   qselect       set or print guarded patches to push
+   qseries       print the entire series file
+   qtop          print the name of the current patch
+   qunapplied    print the patches not yet applied
+   strip         strip changesets and all their descendants from the repository
   
   use "hg -v help mq" to show builtin aliases and global options
 

tests/test-strict.t

@@ -16,24 +16,24 b''
   
   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
-   phase      set or show the current phase name
-   pull       pull changes from the specified source
-   push       push changes to the specified destination
-   remove     remove the specified files on the next commit
-   serve      start stand-alone webserver
-   status     show changed files in the working directory
-   summary    summarize working directory state
-   update     update working directory (or switch revisions)
+   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
+   phase       set or show the current phase name
+   pull        pull changes from the specified source
+   push        push changes to the specified destination
+   remove      remove the specified files on the next commit
+   serve       start stand-alone webserver
+   status      show changed files in the working directory
+   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
   [255]