diff mercurial/commands.py @ 12705:d734b3470138

merge with mpm
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Oct 2010 13:26:29 -0500
parents 0159a674a7bc 7aef77e74cf3
children 61c0df2b089a
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 11 12:47:11 2010 -0500
+++ b/mercurial/commands.py	Mon Oct 11 13:26:29 2010 -0500
@@ -1949,7 +1949,7 @@
                 commands = cmds[f].replace("|",", ")
                 ui.write(" %s:\n      %s\n"%(commands, h[f]))
             else:
-                ui.write('%s\n' % (util.wrap(h[f],
+                ui.write('%s\n' % (util.wrap(h[f], textwidth,
                                              initindent=' %-*s   ' % (m, f),
                                              hangindent=' ' * (m + 4))))
 
@@ -2106,7 +2106,7 @@
             if desc:
                 initindent = ' %s%s  ' % (opt, ' ' * (hanging - width))
                 hangindent = ' ' * (hanging + 3)
-                ui.write('%s\n' % (util.wrap(desc,
+                ui.write('%s\n' % (util.wrap(desc, textwidth,
                                              initindent=initindent,
                                              hangindent=hangindent)))
             else: