diff -r 2151703e7f84 -r 63ab6b0ccedc mercurial/commands.py
--- a/mercurial/commands.py	Sun Mar 13 13:05:16 2011 +0100
+++ b/mercurial/commands.py	Sun Mar 13 13:38:44 2011 +0100
@@ -1985,7 +1985,7 @@
     Returns 0 if successful.
     """
     option_lists = []
-    textwidth = ui.termwidth() - 2
+    textwidth = min(ui.termwidth(), 80) - 2
 
     def addglobalopts(aliases):
         if ui.verbose: