diff --git a/mercurial/commands.py b/mercurial/commands.py
index 2151703e7f844fb42864d49c853ea7cb284bbb9b_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..63ab6b0ccedcb393c5adba9be3a8d72fe0e7fb57_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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: