progress: respect HGPLAIN
authorMatt Mackall <mpm@selenic.com>
Tue, 16 Jul 2013 11:17:01 -0500
changeset 19404 b4744c3b991e
parent 19403 9013f2930a4a
child 19405 447332970d7b
progress: respect HGPLAIN
hgext/progress.py
--- a/hgext/progress.py	Thu Jul 11 19:29:23 2013 -0500
+++ b/hgext/progress.py	Tue Jul 16 11:17:01 2013 -0500
@@ -45,7 +45,8 @@
     return ' '.join(s for s in args if s)
 
 def shouldprint(ui):
-    return ui._isatty(sys.stderr) or ui.configbool('progress', 'assume-tty')
+    return not ui.plain() and (ui._isatty(sys.stderr) or
+                               ui.configbool('progress', 'assume-tty'))
 
 def fmtremaining(seconds):
     if seconds < 60: