# HG changeset patch # User Martin von Zweigbergk # Date 2018-12-19 17:33:42 # Node ID e8e2a7656e83ccb1444af8c13b7cc4b9d172bec5 # Parent fcc0a7ac9ebd0a1f97e593457470dd785f0b2151 help: hide default value for default-off flags If we no longer show the "[no-]" for default-off flags, it also seems unnecessary to show the "default: off" for them, since that's quite clearly the default. It's extra confusing for action flags like `hg bookmarks --delete`. Differential Revision: https://phab.mercurial-scm.org/D5455 diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -165,14 +165,14 @@ def optrst(header, options, verbose): if isinstance(default, fancyopts.customopt): default = default.getdefaultvalue() - if (default and not callable(default)) or default is False: + if default and not callable(default): # default is of unknown type, and in Python 2 we abused # the %s-shows-repr property to handle integers etc. To # match that behavior on Python 3, we do str(default) and # then convert it to bytes. defaultstr = pycompat.bytestr(default) - if isinstance(default, bool): - defaultstr = _("on") if default else _("off") + if default is True: + defaultstr = _("on") desc += _(" (default: %s)") % defaultstr if isinstance(default, list): diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -716,7 +716,7 @@ hide outer repo --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -755,7 +755,7 @@ hide outer repo --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -1043,7 +1043,7 @@ extension help itself --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -1080,7 +1080,7 @@ Make sure that single '-v' option shows --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -1155,7 +1155,7 @@ help options '-v' and '-v -e' should be --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -1191,7 +1191,7 @@ help options '-v' and '-v -e' should be --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) diff --git a/tests/test-fix.t b/tests/test-fix.t --- a/tests/test-fix.t +++ b/tests/test-fix.t @@ -104,12 +104,12 @@ Help text for fix. options ([+] can be repeated): - --all fix all non-public non-obsolete revisions (default: off) + --all fix all non-public non-obsolete revisions --base REV [+] revisions to diff against (overrides automatic selection, and applies to every revision being fixed) -r --rev REV [+] revisions to fix - -w --working-dir fix the working directory (default: off) - --whole always fix every line of a file (default: off) + -w --working-dir fix the working directory + --whole always fix every line of a file (some details hidden, use --verbose to show complete help) diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -440,7 +440,7 @@ Test short command list with verbose opt --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -540,7 +540,7 @@ Verbose help for add --profile print command execution profile --version output version information and exit -h --help display help and exit - --hidden consider hidden changesets (default: off) + --hidden consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -905,7 +905,7 @@ Test command with no help text xxxxxxxxxxxxxxxxxxxxxxx (default: 3) -n -- normal desc --newline VALUE line1 line2 - --default-off enable X (default: off) + --default-off enable X --[no-]default-on enable Y (default: on) --callableopt VALUE adds foo --customopt VALUE adds bar @@ -2890,7 +2890,7 @@ Dish up an empty repo; serve it cold. display help and exit --hidden - consider hidden changesets (default: off) + consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) @@ -3094,7 +3094,7 @@ Dish up an empty repo; serve it cold. display help and exit --hidden - consider hidden changesets (default: off) + consider hidden changesets --pager TYPE when to paginate (boolean, always, auto, or never) (default: auto) diff --git a/tests/test-narrow-trackedcmd.t b/tests/test-narrow-trackedcmd.t --- a/tests/test-narrow-trackedcmd.t +++ b/tests/test-narrow-trackedcmd.t @@ -105,9 +105,8 @@ Testing the --import-rules flag of `hg t --import-rules VALUE import narrowspecs from a file --removeexclude VALUE [+] old paths to no longer exclude --clear whether to replace the existing narrowspec - (default: off) --force-delete-local-changes forces deletion of local changes when - narrowing (default: off) + narrowing -e --ssh CMD specify ssh command to use --remotecmd CMD specify hg command to run on the remote side --insecure do not verify server certificate (ignoring diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -75,7 +75,7 @@ shelve has a help message --cleanup delete all shelved changes --date DATE shelve with the specified commit date -d --delete delete the named shelved change(s) - -e --edit invoke editor on commit messages (default: off) + -e --edit invoke editor on commit messages -l --list list current shelves -m --message TEXT use text as shelve message -n --name NAME use the given name for the shelved commit diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t --- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -34,8 +34,7 @@ Help for uncommit options ([+] can be repeated): - --keep allow an empty commit after uncommiting (default: - off) + --keep allow an empty commit after uncommiting -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns