changeset 19404:b4744c3b991e

progress: respect HGPLAIN
author Matt Mackall <mpm@selenic.com>
date Tue, 16 Jul 2013 11:17:01 -0500
parents 9013f2930a4a
children 447332970d7b
files hgext/progress.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: