##// END OF EJS Templates
help: normalize helplist hints
Matt Mackall -
r22118:9a299c39 default
parent child Browse files
Show More
@@ -369,18 +369,19 b' def help_(ui, name, unknowncmd=False, fu'
369 rst.append('\n%s\n' % optrst(_("global options"),
369 rst.append('\n%s\n' % optrst(_("global options"),
370 commands.globalopts, ui.verbose))
370 commands.globalopts, ui.verbose))
371 if name == 'shortlist':
371 if name == 'shortlist':
372 rst.append(_('\nuse "hg help" for the full list '
372 rst.append(_('\n(use "hg help" for the full list '
373 'of commands\n'))
373 'of commands)\n'))
374 else:
374 else:
375 if name == 'shortlist':
375 if name == 'shortlist':
376 rst.append(_('\nuse "hg help" for the full list of commands '
376 rst.append(_('\n(use "hg help" for the full list of commands '
377 'or "hg -v" for details\n'))
377 'or "hg -v" for details)\n'))
378 elif name and not full:
378 elif name and not full:
379 rst.append(_('\nuse "hg help %s" to show the full help '
379 rst.append(_('\n(use "hg help %s" to show the full help '
380 'text\n') % name)
380 'text)\n') % name)
381 else:
381 else:
382 rst.append(_('\nuse "hg -v help%s" to show builtin aliases and '
382 rst.append(_('\n(use "hg help -v%s" to show built-in aliases '
383 'global options\n') % (name and " " + name or ""))
383 'and global options)\n')
384 % (name and " " + name or ""))
384 return rst
385 return rst
385
386
386 def helptopic(name):
387 def helptopic(name):
@@ -399,7 +399,7 b' invalid global arguments for normal comm'
399 summary summarize working directory state
399 summary summarize working directory state
400 update update working directory (or switch revisions)
400 update update working directory (or switch revisions)
401
401
402 use "hg help" for the full list of commands or "hg -v" for details
402 (use "hg help" for the full list of commands or "hg -v" for details)
403 [255]
403 [255]
404 $ hg --invalid mylog
404 $ hg --invalid mylog
405 hg: option --invalid not recognized
405 hg: option --invalid not recognized
@@ -425,7 +425,7 b' invalid global arguments for normal comm'
425 summary summarize working directory state
425 summary summarize working directory state
426 update update working directory (or switch revisions)
426 update update working directory (or switch revisions)
427
427
428 use "hg help" for the full list of commands or "hg -v" for details
428 (use "hg help" for the full list of commands or "hg -v" for details)
429 [255]
429 [255]
430 $ hg --invalid blank
430 $ hg --invalid blank
431 hg: option --invalid not recognized
431 hg: option --invalid not recognized
@@ -451,7 +451,7 b' invalid global arguments for normal comm'
451 summary summarize working directory state
451 summary summarize working directory state
452 update update working directory (or switch revisions)
452 update update working directory (or switch revisions)
453
453
454 use "hg help" for the full list of commands or "hg -v" for details
454 (use "hg help" for the full list of commands or "hg -v" for details)
455 [255]
455 [255]
456
456
457 This should show id:
457 This should show id:
@@ -34,7 +34,7 b' basic commands:'
34 summary summarize working directory state
34 summary summarize working directory state
35 update update working directory (or switch revisions)
35 update update working directory (or switch revisions)
36
36
37 use "hg help" for the full list of commands or "hg -v" for details
37 (use "hg help" for the full list of commands or "hg -v" for details)
38 runcommand id --quiet
38 runcommand id --quiet
39 000000000000
39 000000000000
40 runcommand id
40 runcommand id
@@ -463,7 +463,7 b' Extension module help vs command help:'
463
463
464 extdiff use external program to diff repository (or selected files)
464 extdiff use external program to diff repository (or selected files)
465
465
466 use "hg -v help extdiff" to show builtin aliases and global options
466 (use "hg help -v extdiff" to show built-in aliases and global options)
467
467
468
468
469
469
@@ -357,7 +357,7 b' Testing -h/--help:'
357 templating Template Usage
357 templating Template Usage
358 urls URL Paths
358 urls URL Paths
359
359
360 use "hg -v help" to show builtin aliases and global options
360 (use "hg help -v" to show built-in aliases and global options)
361
361
362
362
363
363
@@ -439,7 +439,7 b' Testing -h/--help:'
439 templating Template Usage
439 templating Template Usage
440 urls URL Paths
440 urls URL Paths
441
441
442 use "hg -v help" to show builtin aliases and global options
442 (use "hg help -v" to show built-in aliases and global options)
443
443
444 Not tested: --debugger
444 Not tested: --debugger
445
445
@@ -23,7 +23,7 b' Short help:'
23 summary summarize working directory state
23 summary summarize working directory state
24 update update working directory (or switch revisions)
24 update update working directory (or switch revisions)
25
25
26 use "hg help" for the full list of commands or "hg -v" for details
26 (use "hg help" for the full list of commands or "hg -v" for details)
27
27
28 $ hg -q
28 $ hg -q
29 add add the specified files on the next commit
29 add add the specified files on the next commit
@@ -122,7 +122,7 b' Short help:'
122 templating Template Usage
122 templating Template Usage
123 urls URL Paths
123 urls URL Paths
124
124
125 use "hg -v help" to show builtin aliases and global options
125 (use "hg help -v" to show built-in aliases and global options)
126
126
127 $ hg -q help
127 $ hg -q help
128 add add the specified files on the next commit
128 add add the specified files on the next commit
@@ -326,7 +326,7 b' Test short command list with verbose opt'
326 -h --help display help and exit
326 -h --help display help and exit
327 --hidden consider hidden changesets
327 --hidden consider hidden changesets
328
328
329 use "hg help" for the full list of commands
329 (use "hg help" for the full list of commands)
330
330
331 $ hg add -h
331 $ hg add -h
332 hg add [OPTION]... [FILE]...
332 hg add [OPTION]... [FILE]...
@@ -441,7 +441,7 b' Test ambiguous command help'
441 add add the specified files on the next commit
441 add add the specified files on the next commit
442 addremove add all new files, delete all missing files
442 addremove add all new files, delete all missing files
443
443
444 use "hg -v help ad" to show builtin aliases and global options
444 (use "hg help -v ad" to show built-in aliases and global options)
445
445
446 Test command without options
446 Test command without options
447
447
@@ -610,7 +610,7 b' Test command without options'
610 summary summarize working directory state
610 summary summarize working directory state
611 update update working directory (or switch revisions)
611 update update working directory (or switch revisions)
612
612
613 use "hg help" for the full list of commands or "hg -v" for details
613 (use "hg help" for the full list of commands or "hg -v" for details)
614 [255]
614 [255]
615
615
616
616
@@ -744,7 +744,7 b' Test that default list of commands omits'
744 templating Template Usage
744 templating Template Usage
745 urls URL Paths
745 urls URL Paths
746
746
747 use "hg -v help" to show builtin aliases and global options
747 (use "hg help -v" to show built-in aliases and global options)
748
748
749
749
750 Test list of internal help commands
750 Test list of internal help commands
@@ -806,7 +806,7 b' Test list of internal help commands'
806 debugwireargs
806 debugwireargs
807 (no help text available)
807 (no help text available)
808
808
809 use "hg -v help debug" to show builtin aliases and global options
809 (use "hg help -v debug" to show built-in aliases and global options)
810
810
811
811
812 Test list of commands with command with no help text
812 Test list of commands with command with no help text
@@ -818,7 +818,7 b' Test list of commands with command with '
818
818
819 nohelp (no help text available)
819 nohelp (no help text available)
820
820
821 use "hg -v help helpext" to show builtin aliases and global options
821 (use "hg help -v helpext" to show built-in aliases and global options)
822
822
823
823
824 test deprecated option is hidden in command help
824 test deprecated option is hidden in command help
@@ -95,7 +95,7 b' help'
95 qtop print the name of the current patch
95 qtop print the name of the current patch
96 qunapplied print the patches not yet applied
96 qunapplied print the patches not yet applied
97
97
98 use "hg -v help mq" to show builtin aliases and global options
98 (use "hg help -v mq" to show built-in aliases and global options)
99
99
100 $ hg init a
100 $ hg init a
101 $ cd a
101 $ cd a
@@ -37,7 +37,7 b''
37 summary summarize working directory state
37 summary summarize working directory state
38 update update working directory (or switch revisions)
38 update update working directory (or switch revisions)
39
39
40 use "hg help" for the full list of commands or "hg -v" for details
40 (use "hg help" for the full list of commands or "hg -v" for details)
41 [255]
41 [255]
42 $ hg annotate a
42 $ hg annotate a
43 0: a
43 0: a
General Comments 0
You need to be logged in to leave comments. Login now