Show More
@@ -363,30 +363,24 b' def help_(ui, name, unknowncmd=False, fu' | |||||
363 | for t, desc in topics: |
|
363 | for t, desc in topics: | |
364 | rst.append(" :%s: %s\n" % (t, desc)) |
|
364 | rst.append(" :%s: %s\n" % (t, desc)) | |
365 |
|
365 | |||
366 | optlist = [] |
|
366 | if ui.quiet: | |
367 | if not ui.quiet: |
|
367 | pass | |
368 |
|
|
368 | elif ui.verbose: | |
369 |
|
|
369 | rst.append(_("\nglobal options:\n")) | |
370 | if name == 'shortlist': |
|
370 | rst.append('\n%s\n' % optrst(commands.globalopts, ui.verbose)) | |
371 | optlist.append((_('use "hg help" for the full list ' |
|
371 | if name == 'shortlist': | |
372 | 'of commands'), ())) |
|
372 | rst.append(_('\nuse "hg help" for the full list ' | |
|
373 | 'of commands\n')) | |||
|
374 | else: | |||
|
375 | if name == 'shortlist': | |||
|
376 | rst.append(_('\nuse "hg help" for the full list of commands ' | |||
|
377 | 'or "hg -v" for details\n')) | |||
|
378 | elif name and not full: | |||
|
379 | rst.append(_('\nuse "hg help %s" to show the full help ' | |||
|
380 | 'text\n') % name) | |||
373 | else: |
|
381 | else: | |
374 | if name == 'shortlist': |
|
382 | rst.append(_('\nuse "hg -v help%s" to show builtin aliases and ' | |
375 | msg = _('use "hg help" for the full list of commands ' |
|
383 | 'global options\n') % (name and " " + name or "")) | |
376 | 'or "hg -v" for details') |
|
|||
377 | elif name and not full: |
|
|||
378 | msg = _('use "hg help %s" to show the full help ' |
|
|||
379 | 'text') % name |
|
|||
380 | else: |
|
|||
381 | msg = _('use "hg -v help%s" to show builtin aliases and ' |
|
|||
382 | 'global options') % (name and " " + name or "") |
|
|||
383 | optlist.append((msg, ())) |
|
|||
384 |
|
||||
385 | if optlist: |
|
|||
386 | for title, options in optlist: |
|
|||
387 | rst.append('\n%s\n' % title) |
|
|||
388 | if options: |
|
|||
389 | rst.append('\n%s\n' % optrst(options, ui.verbose)) |
|
|||
390 | return rst |
|
384 | return rst | |
391 |
|
385 | |||
392 | def helptopic(name): |
|
386 | def helptopic(name): |
General Comments 0
You need to be logged in to leave comments.
Login now