--- a/mercurial/commands.py Thu Oct 18 23:55:15 2012 -0500
+++ b/mercurial/commands.py Thu Oct 18 10:31:15 2012 +0900
@@ -3265,8 +3265,12 @@
rst.append(_('\nuse "hg help %s" to show the full help text\n')
% name)
elif not ui.quiet:
- rst.append(_('\nuse "hg -v help %s" to show more info\n')
- % name)
+ omitted = _('use "hg -v help %s" to show more complete'
+ ' help and the global options') % name
+ notomitted = _('use "hg -v help %s" to show'
+ ' the global options') % name
+ help.indicateomitted(rst, omitted, notomitted)
+
return rst
@@ -3369,6 +3373,11 @@
if util.safehasattr(doc, '__call__'):
rst += [" %s\n" % l for l in doc().splitlines()]
+ if not ui.verbose:
+ omitted = (_('use "hg help -v %s" to show more complete help') %
+ name)
+ help.indicateomitted(rst, omitted)
+
try:
cmdutil.findcmd(name, table)
rst.append(_('\nuse "hg help -c %s" to see help for '
@@ -3396,6 +3405,11 @@
rst.extend(tail.splitlines(True))
rst.append('\n')
+ if not ui.verbose:
+ omitted = (_('use "hg help -v %s" to show more complete help') %
+ name)
+ help.indicateomitted(rst, omitted)
+
if mod:
try:
ct = mod.cmdtable
@@ -3459,7 +3473,13 @@
rst.extend(helplist())
keep = ui.verbose and ['verbose'] or []
- formatted, pruned = minirst.format(''.join(rst), textwidth, keep=keep)
+ text = ''.join(rst)
+ formatted, pruned = minirst.format(text, textwidth, keep=keep)
+ if 'verbose' in pruned:
+ keep.append('omitted')
+ else:
+ keep.append('notomitted')
+ formatted, pruned = minirst.format(text, textwidth, keep=keep)
ui.write(formatted)