Un-debugify debugconfig to showconfig. (issue 317)

mercurial/commands.py

@@ -1134,7 +1134,7 b' def debugcheckstate(ui, repo):'
         error = _(".hg/dirstate inconsistent with current parent's manifest")
         raise util.Abort(error)
 
-def debugconfig(ui, repo, *values):
+def showconfig(ui, repo, *values):
     """show combined config settings from all hgrc files
 
     With no args, print names and values of all config items.
@@ -2834,7 +2834,6 b' table = {'
          [('r', 'rev', '', _('revision to rebuild to'))],
          _('debugrebuildstate [-r REV] [REV]')),
     "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
-    "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')),
     "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
     "debugstate": (debugstate, [], _('debugstate')),
     "debugdata": (debugdata, [], _('debugdata FILE REV')),
@@ -3017,6 +3016,7 b' table = {'
          _('hg revert [-r REV] [NAME]...')),
     "rollback": (rollback, [], _('hg rollback')),
     "root": (root, [], _('hg root')),
+    "showconfig|debugconfig": (showconfig, [], _('showconfig [NAME]...')),
     "^serve":
         (serve,
          [('A', 'accesslog', '', _('name of access log file to write to')),
@@ -3086,7 +3086,7 b' table = {'
 
 norepo = ("clone init version help debugancestor debugcomplete debugdata"
           " debugindex debugindexdot")
-optionalrepo = ("paths serve debugconfig")
+optionalrepo = ("paths serve showconfig")
 
 def findpossible(ui, cmd):
     """

tests/test-globalopts.out

@@ -114,94 +114,96 b' Mercurial Distributed SCM'
 
 list of commands (use "hg help -v" 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 per file line
- archive     create unversioned archive of a repository revision
- backout     reverse effect of earlier changeset
- bundle      create a changegroup file
- cat         output the latest or given revisions 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
- grep        search for a pattern in specified files and revisions
- heads       show current repository heads
- help        show help for a command, extension, or list of commands
- identify    print information about the working copy
- 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 latest 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 dir or revision
- paths       show definition of symbolic path names
- 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
- revert      revert files or dirs to their states as of some revision
- rollback    roll back the last transaction in this repository
- root        print the root (top) of the current working dir
- serve       export the repository via HTTP
- status      show changed files in the working directory
- tag         add a tag for the current tip or a given revision
- tags        list repository tags
- tip         show the tip revision
- unbundle    apply a changegroup file
- update      update or merge working directory
- 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 per file line
+ archive      create unversioned archive of a repository revision
+ backout      reverse effect of earlier changeset
+ bundle       create a changegroup file
+ cat          output the latest or given revisions 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
+ grep         search for a pattern in specified files and revisions
+ heads        show current repository heads
+ help         show help for a command, extension, or list of commands
+ identify     print information about the working copy
+ 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 latest 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 dir or revision
+ paths        show definition of symbolic path names
+ 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
+ revert       revert files or dirs to their states as of some revision
+ rollback     roll back the last transaction in this repository
+ root         print the root (top) of the current working dir
+ serve        export the repository via HTTP
+ showconfig   show combined config settings from all hgrc files
+ status       show changed files in the working directory
+ tag          add a tag for the current tip or a given revision
+ tags         list repository tags
+ tip          show the tip revision
+ unbundle     apply a changegroup file
+ update       update or merge working directory
+ verify       verify the integrity of the repository
+ version      output version and copyright information
 Mercurial Distributed SCM
 
 list of commands (use "hg help -v" 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 per file line
- archive     create unversioned archive of a repository revision
- backout     reverse effect of earlier changeset
- bundle      create a changegroup file
- cat         output the latest or given revisions 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
- grep        search for a pattern in specified files and revisions
- heads       show current repository heads
- help        show help for a command, extension, or list of commands
- identify    print information about the working copy
- 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 latest 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 dir or revision
- paths       show definition of symbolic path names
- 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
- revert      revert files or dirs to their states as of some revision
- rollback    roll back the last transaction in this repository
- root        print the root (top) of the current working dir
- serve       export the repository via HTTP
- status      show changed files in the working directory
- tag         add a tag for the current tip or a given revision
- tags        list repository tags
- tip         show the tip revision
- unbundle    apply a changegroup file
- update      update or merge working directory
- 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 per file line
+ archive      create unversioned archive of a repository revision
+ backout      reverse effect of earlier changeset
+ bundle       create a changegroup file
+ cat          output the latest or given revisions 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
+ grep         search for a pattern in specified files and revisions
+ heads        show current repository heads
+ help         show help for a command, extension, or list of commands
+ identify     print information about the working copy
+ 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 latest 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 dir or revision
+ paths        show definition of symbolic path names
+ 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
+ revert       revert files or dirs to their states as of some revision
+ rollback     roll back the last transaction in this repository
+ root         print the root (top) of the current working dir
+ serve        export the repository via HTTP
+ showconfig   show combined config settings from all hgrc files
+ status       show changed files in the working directory
+ tag          add a tag for the current tip or a given revision
+ tags         list repository tags
+ tip          show the tip revision
+ unbundle     apply a changegroup file
+ update       update or merge working directory
+ verify       verify the integrity of the repository
+ version      output version and copyright information
 %% not tested: --debugger

tests/test-help.out

@@ -38,92 +38,94 b' Mercurial Distributed SCM'
 
 list of commands (use "hg help -v" 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 per file line
- archive     create unversioned archive of a repository revision
- backout     reverse effect of earlier changeset
- bundle      create a changegroup file
- cat         output the latest or given revisions 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
- grep        search for a pattern in specified files and revisions
- heads       show current repository heads
- help        show help for a command, extension, or list of commands
- identify    print information about the working copy
- 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 latest 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 dir or revision
- paths       show definition of symbolic path names
- 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
- revert      revert files or dirs to their states as of some revision
- rollback    roll back the last transaction in this repository
- root        print the root (top) of the current working dir
- serve       export the repository via HTTP
- status      show changed files in the working directory
- tag         add a tag for the current tip or a given revision
- tags        list repository tags
- tip         show the tip revision
- unbundle    apply a changegroup file
- update      update or merge working directory
- 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 per file line
- archive     create unversioned archive of a repository revision
- backout     reverse effect of earlier changeset
- bundle      create a changegroup file
- cat         output the latest or given revisions 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
- grep        search for a pattern in specified files and revisions
- heads       show current repository heads
- help        show help for a command, extension, or list of commands
- identify    print information about the working copy
- 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 latest 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 dir or revision
- paths       show definition of symbolic path names
- 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
- revert      revert files or dirs to their states as of some revision
- rollback    roll back the last transaction in this repository
- root        print the root (top) of the current working dir
- serve       export the repository via HTTP
- status      show changed files in the working directory
- tag         add a tag for the current tip or a given revision
- tags        list repository tags
- tip         show the tip revision
- unbundle    apply a changegroup file
- update      update or merge working directory
- 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 per file line
+ archive      create unversioned archive of a repository revision
+ backout      reverse effect of earlier changeset
+ bundle       create a changegroup file
+ cat          output the latest or given revisions 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
+ grep         search for a pattern in specified files and revisions
+ heads        show current repository heads
+ help         show help for a command, extension, or list of commands
+ identify     print information about the working copy
+ 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 latest 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 dir or revision
+ paths        show definition of symbolic path names
+ 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
+ revert       revert files or dirs to their states as of some revision
+ rollback     roll back the last transaction in this repository
+ root         print the root (top) of the current working dir
+ serve        export the repository via HTTP
+ showconfig   show combined config settings from all hgrc files
+ status       show changed files in the working directory
+ tag          add a tag for the current tip or a given revision
+ tags         list repository tags
+ tip          show the tip revision
+ unbundle     apply a changegroup file
+ update       update or merge working directory
+ 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 per file line
+ archive      create unversioned archive of a repository revision
+ backout      reverse effect of earlier changeset
+ bundle       create a changegroup file
+ cat          output the latest or given revisions 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
+ grep         search for a pattern in specified files and revisions
+ heads        show current repository heads
+ help         show help for a command, extension, or list of commands
+ identify     print information about the working copy
+ 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 latest 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 dir or revision
+ paths        show definition of symbolic path names
+ 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
+ revert       revert files or dirs to their states as of some revision
+ rollback     roll back the last transaction in this repository
+ root         print the root (top) of the current working dir
+ serve        export the repository via HTTP
+ showconfig   show combined config settings from all hgrc files
+ status       show changed files in the working directory
+ tag          add a tag for the current tip or a given revision
+ tags         list repository tags
+ tip          show the tip revision
+ unbundle     apply a changegroup file
+ update       update or merge working directory
+ verify       verify the integrity of the repository
+ version      output version and copyright information
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit