Mercurial > hg
changeset 30152:d65e246100ed
help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
The ability to negate any boolean flags itself is great, but I think we are not
ready to expose the help side of it yet.
First, while there exist a handful of such flags whose default value can be
changed (eg: git diff, patchwork confirmation), there is only a few of them. The
users who benefit the most from this change are alias users and large
installation that can deploy extension to change behavior (eg: facebook
tweakdefault). So the majority of user who will be affected by a large change
to command help that is not yet relevant to them. (I expect this to become
relevant when ui.progressive start to exists).
Below is an example of the impact of the new help on 'hg help diff':
-r --rev REV [+] revision
-c --change REV change made by revision
-a --[no-]text treat all files as text
-g --[no-]git use git extended diff format
--[no-]nodates omit dates from diff headers
--[no-]noprefix omit a/ and b/ prefixes from filenames
-p --[no-]show-function show which function each change is in
--[no-]reverse produce a diff that undoes the changes
-w --[no-]ignore-all-space ignore white space when comparing lines
-b --[no-]ignore-space-change ignore changes in the amount of white space
-B --[no-]ignore-blank-lines ignore changes whose lines are all blank
-U --unified NUM number of lines of context to show
--[no-]stat output diffstat-style summary of changes
--root DIR produce diffs relative to subdirectory
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --[no-]subrepos recurse into subrepositories
Another issue with the current state of help, the default value for the
flag is not conveyed to the user. For example in the 'backout' help, there is
no real distinction between "--[no-]backup" (default to True) and "--[no-]keep"
(default) to False:
--[no-]backup no backups
--[no-]keep do not modify working directory during strip
In addition, I've discussed with Augie Fackler and the last batch of the work on
this have burned him out quite some. Therefore he is not intending to perform
any more work on this topic. Quoting him, he would rather see the help part
backed out than spending more time on it.
I do not think we are ready to expose this to users in 4.0 (freeze in a week),
especially because we cannot expect quick improvement on these aspect as this
topic no longer have an owner. We should be able to reintroduce that change in
the future when someone get back on it and the main issues are solves:
* Introduction of ui.progressive makes it relevant for a majority of user,
* Current default value are efficiently conveyed to the user.
(In addition, the excerpt from diff help show that we still have some issue with
some negative option like '--nodates' so further improvement are probably
welcome there.)
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sun, 09 Oct 2016 03:11:18 +0200 |
| parents | 381293e1135e |
| children | edb49a90723c |
| files | mercurial/help.py tests/test-convert.t tests/test-dispatch.t tests/test-extdiff.t tests/test-extension.t tests/test-help.t tests/test-mq-qrefresh-interactive.t tests/test-qrecord.t tests/test-record.t tests/test-shelve.t tests/test-strip.t |
| diffstat | 11 files changed, 206 insertions(+), 218 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help.py Mon Sep 19 17:15:39 2016 -0400 +++ b/mercurial/help.py Sun Oct 09 03:11:18 2016 +0200 @@ -20,7 +20,6 @@ encoding, error, extensions, - fancyopts, filemerge, fileset, minirst, @@ -66,7 +65,6 @@ def optrst(header, options, verbose): data = [] multioccur = False - alllong = set(o[1] for o in options) for option in options: if len(option) == 5: shortopt, longopt, default, desc, optlabel = option @@ -89,16 +87,6 @@ multioccur = True elif (default is not None) and not isinstance(default, bool): lo += " %s" % optlabel - elif longopt not in fancyopts.nevernegate: - if longopt.startswith('no-'): - # This odd if statement guards against showing - # --no-commit and --commit on backout (as a practical - # example) as --[no-]commit in help. - if (longopt[3:]) not in alllong: - lo = '--[no-]' + lo[5:] - else: - if ('no-' + longopt) not in alllong: - lo = '--[no-]' + lo[2:] data.append((so, lo, desc))
--- a/tests/test-convert.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-convert.t Sun Oct 09 03:11:18 2016 +0200 @@ -327,13 +327,13 @@ -r --rev REV [+] import up to source revision REV -A --authormap FILE remap usernames using this file --filemap FILE remap file names using contents of file - --[no-]full apply filemap changes by converting all files again + --full apply filemap changes by converting all files again --splicemap FILE splice synthesized history into place --branchmap FILE change branch names while converting - --[no-]branchsort try to sort changesets by branches - --[no-]datesort try to sort changesets by date - --[no-]sourcesort preserve source changesets order - --[no-]closesort try to reorder closed revisions + --branchsort try to sort changesets by branches + --datesort try to sort changesets by date + --sourcesort preserve source changesets order + --closesort try to reorder closed revisions (some details hidden, use --verbose to show complete help) $ hg init a
--- a/tests/test-dispatch.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-dispatch.t Sun Oct 09 03:11:18 2016 +0200 @@ -23,7 +23,7 @@ -o --output FORMAT print output to file with formatted name -r --rev REV print the given revision - --[no-]decode apply any matching decode filter + --decode apply any matching decode filter -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
--- a/tests/test-extdiff.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-extdiff.t Sun Oct 09 03:11:18 2016 +0200 @@ -48,10 +48,10 @@ -o --option OPT [+] pass option to comparison program -r --rev REV [+] revision -c --change REV change made by revision - --[no-]patch compare patches for two revisions + --patch compare patches for two revisions -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories + -S --subrepos recurse into subrepositories (some details hidden, use --verbose to show complete help)
--- a/tests/test-extension.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-extension.t Sun Oct 09 03:11:18 2016 +0200 @@ -530,19 +530,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets @@ -565,19 +565,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets @@ -624,10 +624,10 @@ -o --option OPT [+] pass option to comparison program -r --rev REV [+] revision -c --change REV change made by revision - --[no-]patch compare patches for two revisions + --patch compare patches for two revisions -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories + -S --subrepos recurse into subrepositories (some details hidden, use --verbose to show complete help) @@ -851,19 +851,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets Make sure that single '-v' option shows help and built-ins only for 'dodo' command $ hg help -v dodo @@ -875,7 +875,7 @@ options: - --[no-]mq operate on patch repository + --mq operate on patch repository global options ([+] can be repeated): @@ -884,19 +884,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets In case when extension name doesn't match any of its commands, help message should ask for '-v' to get list of built-in aliases @@ -955,19 +955,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets $ hg help -v -e dudu dudu extension - @@ -987,19 +987,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets Disabled extension commands:
--- a/tests/test-help.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-help.t Sun Oct 09 03:11:18 2016 +0200 @@ -318,19 +318,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets (use 'hg help' for the full list of commands) @@ -353,8 +353,8 @@ -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories - -n --[no-]dry-run do not perform actions, just print output + -S --subrepos recurse into subrepositories + -n --dry-run do not perform actions, just print output (some details hidden, use --verbose to show complete help) @@ -404,8 +404,8 @@ -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories - -n --[no-]dry-run do not perform actions, just print output + -S --subrepos recurse into subrepositories + -n --dry-run do not perform actions, just print output global options ([+] can be repeated): @@ -414,19 +414,19 @@ --cwd DIR change working directory -y --noninteractive do not prompt, automatically pick the first choice for all prompts - -q --[no-]quiet suppress output - -v --[no-]verbose enable additional output + -q --quiet suppress output + -v --verbose enable additional output --config CONFIG [+] set/override config option (use 'section.name=value') - --[no-]debug enable debugging output - --[no-]debugger start debugger + --debug enable debugging output + --debugger start debugger --encoding ENCODE set the charset encoding (default: ascii) --encodingmode MODE set the charset encoding mode (default: strict) - --[no-]traceback always print a traceback on exception - --[no-]time time how long the command takes - --[no-]profile print command execution profile + --traceback always print a traceback on exception + --time time how long the command takes + --profile print command execution profile --version output version information and exit -h --help display help and exit - --[no-]hidden consider hidden changesets + --hidden consider hidden changesets Test the textwidth config option @@ -464,8 +464,8 @@ -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories - -n --[no-]dry-run do not perform actions, just print output + -S --subrepos recurse into subrepositories + -n --dry-run do not perform actions, just print output (use 'hg add -h' to show more help) [255] @@ -534,23 +534,23 @@ options ([+] can be repeated): - -r --rev REV [+] revision - -c --change REV change made by revision - -a --[no-]text treat all files as text - -g --[no-]git use git extended diff format - --[no-]nodates omit dates from diff headers - --[no-]noprefix omit a/ and b/ prefixes from filenames - -p --[no-]show-function show which function each change is in - --[no-]reverse produce a diff that undoes the changes - -w --[no-]ignore-all-space ignore white space when comparing lines - -b --[no-]ignore-space-change ignore changes in the amount of white space - -B --[no-]ignore-blank-lines ignore changes whose lines are all blank - -U --unified NUM number of lines of context to show - --[no-]stat output diffstat-style summary of changes - --root DIR produce diffs relative to subdirectory - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories + -r --rev REV [+] revision + -c --change REV change made by revision + -a --text treat all files as text + -g --git use git extended diff format + --nodates omit dates from diff headers + --noprefix omit a/ and b/ prefixes from filenames + -p --show-function show which function each change is in + --reverse produce a diff that undoes the changes + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank + -U --unified NUM number of lines of context to show + --stat output diffstat-style summary of changes + --root DIR produce diffs relative to subdirectory + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -S --subrepos recurse into subrepositories (some details hidden, use --verbose to show complete help) @@ -596,22 +596,22 @@ options ([+] can be repeated): - -A --[no-]all show status of all files - -m --[no-]modified show only modified files - -a --[no-]added show only added files - -r --[no-]removed show only removed files - -d --[no-]deleted show only deleted (but tracked) files - -c --[no-]clean show only files without changes - -u --[no-]unknown show only unknown (not tracked) files - -i --[no-]ignored show only ignored files - -n --[no-]status hide status prefix - -C --[no-]copies show source of copied files - -0 --[no-]print0 end filenames with NUL, for use with xargs + -A --all show status of all files + -m --modified show only modified files + -a --added show only added files + -r --removed show only removed files + -d --deleted show only deleted (but tracked) files + -c --clean show only files without changes + -u --unknown show only unknown (not tracked) files + -i --ignored show only ignored files + -n --no-status hide status prefix + -C --copies show source of copied files + -0 --print0 end filenames with NUL, for use with xargs --rev REV [+] show difference from revision --change REV list the changed files of a revision -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - -S --[no-]subrepos recurse into subrepositories + -S --subrepos recurse into subrepositories (some details hidden, use --verbose to show complete help) @@ -717,7 +717,7 @@ options: - --[no-]remote check for push and pull + --remote check for push and pull (some details hidden, use --verbose to show complete help) @@ -743,7 +743,7 @@ --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3) - -n --[no-] normal desc + -n -- normal desc --newline VALUE line1 line2 (some details hidden, use --verbose to show complete help) @@ -1128,9 +1128,9 @@ test deprecated and experimental options is shown with -v $ hg help -v debugoptDEP | grep dopt - --[no-]dopt option is (DEPRECATED) + --dopt option is (DEPRECATED) $ hg help -v debugoptEXP | grep eopt - --[no-]eopt option is (EXPERIMENTAL) + --eopt option is (EXPERIMENTAL) #if gettext test deprecated option is hidden with translation with untranslated description @@ -2474,10 +2474,10 @@ <td>--exclude PATTERN [+]</td> <td>exclude names matching the given patterns</td></tr> <tr><td>-S</td> - <td>--[no-]subrepos</td> + <td>--subrepos</td> <td>recurse into subrepositories</td></tr> <tr><td>-n</td> - <td>--[no-]dry-run</td> + <td>--dry-run</td> <td>do not perform actions, just print output</td></tr> </table> <p> @@ -2494,19 +2494,19 @@ <td>--noninteractive</td> <td>do not prompt, automatically pick the first choice for all prompts</td></tr> <tr><td>-q</td> - <td>--[no-]quiet</td> + <td>--quiet</td> <td>suppress output</td></tr> <tr><td>-v</td> - <td>--[no-]verbose</td> + <td>--verbose</td> <td>enable additional output</td></tr> <tr><td></td> <td>--config CONFIG [+]</td> <td>set/override config option (use 'section.name=value')</td></tr> <tr><td></td> - <td>--[no-]debug</td> + <td>--debug</td> <td>enable debugging output</td></tr> <tr><td></td> - <td>--[no-]debugger</td> + <td>--debugger</td> <td>start debugger</td></tr> <tr><td></td> <td>--encoding ENCODE</td> @@ -2515,13 +2515,13 @@ <td>--encodingmode MODE</td> <td>set the charset encoding mode (default: strict)</td></tr> <tr><td></td> - <td>--[no-]traceback</td> + <td>--traceback</td> <td>always print a traceback on exception</td></tr> <tr><td></td> - <td>--[no-]time</td> + <td>--time</td> <td>time how long the command takes</td></tr> <tr><td></td> - <td>--[no-]profile</td> + <td>--profile</td> <td>print command execution profile</td></tr> <tr><td></td> <td>--version</td> @@ -2530,7 +2530,7 @@ <td>--help</td> <td>display help and exit</td></tr> <tr><td></td> - <td>--[no-]hidden</td> + <td>--hidden</td> <td>consider hidden changesets</td></tr> </table> @@ -2661,13 +2661,13 @@ </p> <table> <tr><td>-A</td> - <td>--[no-]after</td> + <td>--after</td> <td>record delete for missing files</td></tr> <tr><td>-f</td> - <td>--[no-]force</td> + <td>--force</td> <td>forget added files, delete modified files</td></tr> <tr><td>-S</td> - <td>--[no-]subrepos</td> + <td>--subrepos</td> <td>recurse into subrepositories</td></tr> <tr><td>-I</td> <td>--include PATTERN [+]</td> @@ -2690,19 +2690,19 @@ <td>--noninteractive</td> <td>do not prompt, automatically pick the first choice for all prompts</td></tr> <tr><td>-q</td> - <td>--[no-]quiet</td> + <td>--quiet</td> <td>suppress output</td></tr> <tr><td>-v</td> - <td>--[no-]verbose</td> + <td>--verbose</td> <td>enable additional output</td></tr> <tr><td></td> <td>--config CONFIG [+]</td> <td>set/override config option (use 'section.name=value')</td></tr> <tr><td></td> - <td>--[no-]debug</td> + <td>--debug</td> <td>enable debugging output</td></tr> <tr><td></td> - <td>--[no-]debugger</td> + <td>--debugger</td> <td>start debugger</td></tr> <tr><td></td> <td>--encoding ENCODE</td> @@ -2711,13 +2711,13 @@ <td>--encodingmode MODE</td> <td>set the charset encoding mode (default: strict)</td></tr> <tr><td></td> - <td>--[no-]traceback</td> + <td>--traceback</td> <td>always print a traceback on exception</td></tr> <tr><td></td> - <td>--[no-]time</td> + <td>--time</td> <td>time how long the command takes</td></tr> <tr><td></td> - <td>--[no-]profile</td> + <td>--profile</td> <td>print command execution profile</td></tr> <tr><td></td> <td>--version</td> @@ -2726,7 +2726,7 @@ <td>--help</td> <td>display help and exit</td></tr> <tr><td></td> - <td>--[no-]hidden</td> + <td>--hidden</td> <td>consider hidden changesets</td></tr> </table>
--- a/tests/test-mq-qrefresh-interactive.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-mq-qrefresh-interactive.t Sun Oct 09 03:11:18 2016 +0200 @@ -31,13 +31,13 @@ options ([+] can be repeated): - -e --[no-]edit invoke editor on commit messages - -g --[no-]git use git extended diff format - -s --[no-]short refresh only files already in the patch and + -e --edit invoke editor on commit messages + -g --git use git extended diff format + -s --short refresh only files already in the patch and specified files - -U --[no-]currentuser add/update author field in patch with current user + -U --currentuser add/update author field in patch with current user -u --user USER add/update author field in patch with given user - -D --[no-]currentdate add/update date field in patch with current date + -D --currentdate add/update date field in patch with current date -d --date DATE add/update date field in patch with given date -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns @@ -73,19 +73,19 @@ options ([+] can be repeated): - -e --[no-]edit invoke editor on commit messages - -g --[no-]git use git extended diff format - -s --[no-]short refresh only files already in the patch and + -e --edit invoke editor on commit messages + -g --git use git extended diff format + -s --short refresh only files already in the patch and specified files - -U --[no-]currentuser add/update author field in patch with current user + -U --currentuser add/update author field in patch with current user -u --user USER add/update author field in patch with given user - -D --[no-]currentdate add/update date field in patch with current date + -D --currentdate add/update date field in patch with current date -d --date DATE add/update date field in patch with given date -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -m --message TEXT use text as commit message -l --logfile FILE read commit message from file - -i --[no-]interactive interactively select changes to refresh + -i --interactive interactively select changes to refresh (some details hidden, use --verbose to show complete help)
--- a/tests/test-qrecord.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-qrecord.t Sun Oct 09 03:11:18 2016 +0200 @@ -59,22 +59,22 @@ options ([+] can be repeated): - -A --[no-]addremove mark new/missing files as added/removed before - committing - --[no-]close-branch mark a branch head as closed - --[no-]amend amend the parent of the working directory - -s --[no-]secret use the secret phase for committing - -e --[no-]edit invoke editor on commit messages - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -d --date DATE record the specified date as commit date - -u --user USER record the specified user as committer - -S --[no-]subrepos recurse into subrepositories - -w --[no-]ignore-all-space ignore white space when comparing lines - -b --[no-]ignore-space-change ignore changes in the amount of white space - -B --[no-]ignore-blank-lines ignore changes whose lines are all blank + -A --addremove mark new/missing files as added/removed before + committing + --close-branch mark a branch head as closed + --amend amend the parent of the working directory + -s --secret use the secret phase for committing + -e --edit invoke editor on commit messages + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -d --date DATE record the specified date as commit date + -u --user USER record the specified user as committer + -S --subrepos recurse into subrepositories + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank (some details hidden, use --verbose to show complete help) @@ -135,20 +135,20 @@ options ([+] can be repeated): - -e --[no-]edit invoke editor on commit messages - -g --[no-]git use git extended diff format - -U --[no-]currentuser add "From: <current user>" to patch - -u --user USER add "From: <USER>" to patch - -D --[no-]currentdate add "Date: <current date>" to patch - -d --date DATE add "Date: <DATE>" to patch - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -w --[no-]ignore-all-space ignore white space when comparing lines - -b --[no-]ignore-space-change ignore changes in the amount of white space - -B --[no-]ignore-blank-lines ignore changes whose lines are all blank - --[no-]mq operate on patch repository + -e --edit invoke editor on commit messages + -g --git use git extended diff format + -U --currentuser add "From: <current user>" to patch + -u --user USER add "From: <USER>" to patch + -D --currentdate add "Date: <current date>" to patch + -d --date DATE add "Date: <DATE>" to patch + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank + --mq operate on patch repository (some details hidden, use --verbose to show complete help)
--- a/tests/test-record.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-record.t Sun Oct 09 03:11:18 2016 +0200 @@ -45,22 +45,22 @@ options ([+] can be repeated): - -A --[no-]addremove mark new/missing files as added/removed before - committing - --[no-]close-branch mark a branch head as closed - --[no-]amend amend the parent of the working directory - -s --[no-]secret use the secret phase for committing - -e --[no-]edit invoke editor on commit messages - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -d --date DATE record the specified date as commit date - -u --user USER record the specified user as committer - -S --[no-]subrepos recurse into subrepositories - -w --[no-]ignore-all-space ignore white space when comparing lines - -b --[no-]ignore-space-change ignore changes in the amount of white space - -B --[no-]ignore-blank-lines ignore changes whose lines are all blank + -A --addremove mark new/missing files as added/removed before + committing + --close-branch mark a branch head as closed + --amend amend the parent of the working directory + -s --secret use the secret phase for committing + -e --edit invoke editor on commit messages + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -d --date DATE record the specified date as commit date + -u --user USER record the specified user as committer + -S --subrepos recurse into subrepositories + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank (some details hidden, use --verbose to show complete help)
--- a/tests/test-shelve.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-shelve.t Sun Oct 09 03:11:18 2016 +0200 @@ -58,22 +58,22 @@ options ([+] can be repeated): - -A --[no-]addremove mark new/missing files as added/removed before + -A --addremove mark new/missing files as added/removed before shelving - -u --[no-]unknown store unknown files in the shelve - --[no-]cleanup delete all shelved changes + -u --unknown store unknown files in the shelve + --cleanup delete all shelved changes --date DATE shelve with the specified commit date - -d --[no-]delete delete the named shelved change(s) - -e --[no-]edit invoke editor on commit messages - -l --[no-]list list current shelves + -d --delete delete the named shelved change(s) + -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 - -p --[no-]patch show patch - -i --[no-]interactive interactive mode, only works while creating a shelve - --[no-]stat output diffstat-style summary of changes + -p --patch show patch + -i --interactive interactive mode, only works while creating a shelve + --stat output diffstat-style summary of changes -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns - --[no-]mq operate on patch repository + --mq operate on patch repository (some details hidden, use --verbose to show complete help)
--- a/tests/test-strip.t Mon Sep 19 17:15:39 2016 -0400 +++ b/tests/test-strip.t Sun Oct 09 03:11:18 2016 +0200 @@ -710,12 +710,12 @@ -r --rev REV [+] strip specified revision (optional, can specify revisions without this option) - -f --[no-]force force removal of changesets, discard uncommitted + -f --force force removal of changesets, discard uncommitted changes (no backup) - --[no-]backup no backups - -k --[no-]keep do not modify working directory during strip + --no-backup no backups + -k --keep do not modify working directory during strip -B --bookmark VALUE [+] remove revs only reachable from given bookmark - --[no-]mq operate on patch repository + --mq operate on patch repository (use 'hg strip -h' to show more help) [255]