Mercurial > hg-stable
changeset 15202:0150741caace
help: unify the two -v notes for command help
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 07 Oct 2011 16:36:54 -0500 |
| parents | 2c4fdee4d1a8 |
| children | c7ce651a6bc9 |
| files | mercurial/commands.py tests/test-convert.t tests/test-encoding-align.t tests/test-encoding-textwrap.t tests/test-extdiff.t tests/test-extension.t tests/test-help.t tests/test-mq-qrefresh-interactive.t tests/test-qrecord.t |
| diffstat | 9 files changed, 29 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Oct 05 09:20:38 2011 +0300 +++ b/mercurial/commands.py Fri Oct 07 16:36:54 2011 -0500 @@ -2807,7 +2807,7 @@ msg = _('use "hg -v help%s" to show builtin aliases and ' 'global options') % (name and " " + name or "") else: - msg = _('use "hg -v help %s" to show global options') % name + msg = _('use "hg -v help %s" to show more info') % name optlist.append((msg, ())) def helpcmd(name): @@ -2855,8 +2855,6 @@ keep = ui.verbose and ['verbose'] or [] formatted, pruned = minirst.format(doc, textwidth, keep=keep) ui.write("\n%s" % formatted) - if pruned: - ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name) if not ui.quiet: # options
--- a/tests/test-convert.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-convert.t Fri Oct 07 16:36:54 2011 -0500 @@ -260,7 +260,7 @@ --datesort try to sort changesets by date --sourcesort preserve source changesets order - use "hg -v help convert" to show global options + use "hg -v help convert" to show more info $ hg init a $ cd a $ echo a > a
--- a/tests/test-encoding-align.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-encoding-align.t Fri Oct 07 16:36:54 2011 -0500 @@ -59,7 +59,7 @@ \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) - use "hg -v help showoptlist" to show global options + use "hg -v help showoptlist" to show more info $ rm -f s; touch s
--- a/tests/test-encoding-textwrap.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-encoding-textwrap.t Fri Oct 07 16:36:54 2011 -0500 @@ -67,7 +67,7 @@ \x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8\x82\xa9\x82\xab\x82\xad\x82\xaf\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8\x82\xa9\x82\xab\x82\xad\x82\xaf\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8\x82\xa9\x82\xab\x82\xad\x82\xaf (esc) \x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8\x82\xa9\x82\xab\x82\xad\x82\xaf (esc) - use "hg -v help show_full_ja" to show global options + use "hg -v help show_full_ja" to show more info (1-2) display Japanese full-width characters in utf-8 @@ -82,7 +82,7 @@ \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a\xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a\xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a\xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91 (esc) \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a\xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91 (esc) - use "hg -v help show_full_ja" to show global options + use "hg -v help show_full_ja" to show more info (1-3) display Japanese half-width characters in cp932 @@ -98,7 +98,7 @@ \xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9 (esc) \xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9 (esc) - use "hg -v help show_half_ja" to show global options + use "hg -v help show_half_ja" to show more info (1-4) display Japanese half-width characters in utf-8 @@ -113,7 +113,7 @@ \xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9 (esc) \xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9\xef\xbd\xb1\xef\xbd\xb2\xef\xbd\xb3\xef\xbd\xb4\xef\xbd\xb5\xef\xbd\xb6\xef\xbd\xb7\xef\xbd\xb8\xef\xbd\xb9 (esc) - use "hg -v help show_half_ja" to show global options + use "hg -v help show_half_ja" to show more info @@ -134,7 +134,7 @@ \x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b (esc) \x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b (esc) - use "hg -v help show_ambig_ja" to show global options + use "hg -v help show_ambig_ja" to show more info (2-1-2) display Japanese ambiguous-width characters in utf-8 @@ -149,7 +149,7 @@ \xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b (esc) \xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b (esc) - use "hg -v help show_ambig_ja" to show global options + use "hg -v help show_ambig_ja" to show more info (2-1-3) display Russian ambiguous-width characters in cp1251 @@ -164,7 +164,7 @@ \xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8 (esc) \xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8 (esc) - use "hg -v help show_ambig_ru" to show global options + use "hg -v help show_ambig_ru" to show more info (2-1-4) display Russian ambiguous-width characters in utf-8 @@ -179,7 +179,7 @@ \xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8 (esc) \xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8 (esc) - use "hg -v help show_ambig_ru" to show global options + use "hg -v help show_ambig_ru" to show more info (2-2) treat width of ambiguous characters as wide @@ -200,7 +200,7 @@ \x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b\x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b (esc) \x83\xbf\x83\xc0\x83\xc1\x83\xc2\x83\xd2\x83\xc4\x83\xc5\x83\xc6\x81\x9b (esc) - use "hg -v help show_ambig_ja" to show global options + use "hg -v help show_ambig_ja" to show more info (2-2-2) display Japanese ambiguous-width characters in utf-8 @@ -218,7 +218,7 @@ \xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b\xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b (esc) \xce\xb1\xce\xb2\xce\xb3\xce\xb4\xcf\x85\xce\xb6\xce\xb7\xce\xb8\xe2\x97\x8b (esc) - use "hg -v help show_ambig_ja" to show global options + use "hg -v help show_ambig_ja" to show more info (2-2-3) display Russian ambiguous-width characters in cp1251 @@ -236,7 +236,7 @@ \xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8\xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8 (esc) \xcd\xe0\xf1\xf2\xf0\xee\xe9\xea\xe8 (esc) - use "hg -v help show_ambig_ru" to show global options + use "hg -v help show_ambig_ru" to show more info (2-2-4) display Russian ambiguous-width charactes in utf-8 @@ -254,4 +254,4 @@ \xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8 (esc) \xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8 (esc) - use "hg -v help show_ambig_ru" to show global options + use "hg -v help show_ambig_ru" to show more info
--- a/tests/test-extdiff.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-extdiff.t Fri Oct 07 16:36:54 2011 -0500 @@ -47,7 +47,7 @@ [+] marked option can be specified multiple times - use "hg -v help falabala" to show global options + use "hg -v help falabala" to show more info $ hg ci -d '0 0' -mtest1
--- a/tests/test-extension.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-extension.t Fri Oct 07 16:36:54 2011 -0500 @@ -271,7 +271,7 @@ [+] marked option can be specified multiple times - use "hg -v help extdiff" to show global options + use "hg -v help extdiff" to show more info $ hg help --extension extdiff extdiff extension - command to allow external programs to compare revisions @@ -373,7 +373,7 @@ multirevs command - use "hg -v help multirevs" to show global options + use "hg -v help multirevs" to show more info $ hg multirevs hg multirevs: invalid arguments
--- a/tests/test-help.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-help.t Fri Oct 07 16:36:54 2011 -0500 @@ -276,8 +276,6 @@ Returns 0 if all files are successfully added. - use "hg -v help add" to show verbose help - options: -I --include PATTERN [+] include names matching the given patterns @@ -287,7 +285,7 @@ [+] marked option can be specified multiple times - use "hg -v help add" to show global options + use "hg -v help add" to show more info Verbose help for add @@ -402,7 +400,7 @@ Returns 0 on success, 1 if errors are encountered. - use "hg -v help verify" to show global options + use "hg -v help verify" to show more info $ hg help diff hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... @@ -435,8 +433,6 @@ Returns 0 on success. - use "hg -v help diff" to show verbose help - options: -r --rev REV [+] revision @@ -457,7 +453,7 @@ [+] marked option can be specified multiple times - use "hg -v help diff" to show global options + use "hg -v help diff" to show more info $ hg help status hg status [OPTION]... [FILE]... @@ -499,8 +495,6 @@ Returns 0 on success. - use "hg -v help status" to show verbose help - options: -A --all show status of all files @@ -522,7 +516,7 @@ [+] marked option can be specified multiple times - use "hg -v help status" to show global options + use "hg -v help status" to show more info $ hg -q help status hg status [OPTION]... [FILE]... @@ -606,7 +600,7 @@ (no help text available) - use "hg -v help nohelp" to show global options + use "hg -v help nohelp" to show more info Test that default list of commands omits extension commands
--- a/tests/test-mq-qrefresh-interactive.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-mq-qrefresh-interactive.t Fri Oct 07 16:36:54 2011 -0500 @@ -46,7 +46,7 @@ [+] marked option can be specified multiple times - use "hg -v help qrefresh" to show global options + use "hg -v help qrefresh" to show more info help qrefresh (record) @@ -91,7 +91,7 @@ [+] marked option can be specified multiple times - use "hg -v help qrefresh" to show global options + use "hg -v help qrefresh" to show more info $ hg init a $ cd a
--- a/tests/test-qrecord.t Wed Oct 05 09:20:38 2011 +0300 +++ b/tests/test-qrecord.t Fri Oct 07 16:36:54 2011 -0500 @@ -70,7 +70,7 @@ [+] marked option can be specified multiple times - use "hg -v help record" to show global options + use "hg -v help record" to show more info help (no mq, so no qrecord) @@ -81,7 +81,7 @@ See "hg help qnew" & "hg help record" for more information and usage. - use "hg -v help qrecord" to show global options + use "hg -v help qrecord" to show more info $ hg init a @@ -113,7 +113,7 @@ See "hg help qnew" & "hg help record" for more information and usage. - use "hg -v help qrecord" to show global options + use "hg -v help qrecord" to show more info help (mq present) @@ -146,7 +146,7 @@ [+] marked option can be specified multiple times - use "hg -v help qrecord" to show global options + use "hg -v help qrecord" to show more info $ cd a