--- a/mercurial/commands.py Thu Jun 03 10:37:31 2010 +0100
+++ b/mercurial/commands.py Sun Jun 06 17:20:10 2010 +0900
@@ -1697,7 +1697,9 @@
commands = cmds[f].replace("|",", ")
ui.write(" %s:\n %s\n"%(commands, h[f]))
else:
- ui.write(' %-*s %s\n' % (m, f, util.wrap(h[f], m + 4)))
+ ui.write('%s\n' % (util.wrap(h[f],
+ initindent=' %-*s ' % (m, f),
+ hangindent=' ' * (m + 4))))
if not ui.quiet:
addglobalopts(True)
@@ -1824,8 +1826,11 @@
opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
for first, second in opt_output:
if second:
- second = util.wrap(second, opts_len + 3)
- ui.write(" %-*s %s\n" % (opts_len, first, second))
+ initindent = ' %-*s ' % (opts_len, first)
+ hangindent = ' ' * (opts_len + 3)
+ ui.write('%s\n' % (util.wrap(second,
+ initindent=initindent,
+ hangindent=hangindent)))
else:
ui.write("%s\n" % first)