--- 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:
--- a/mercurial/util.py Mon Oct 11 12:47:11 2010 -0500
+++ b/mercurial/util.py Mon Oct 11 13:26:29 2010 -0500
@@ -1313,9 +1313,7 @@
#### naming convention of above implementation follows 'textwrap' module
-def wrap(line, width=None, initindent='', hangindent=''):
- if width is None:
- width = termwidth() - 2
+def wrap(line, width, initindent='', hangindent=''):
maxindent = max(len(hangindent), len(initindent))
if width <= maxindent:
# adjust for weird terminal size