mercurial/progress.py
changeset 25581 79c75459321e
parent 25497 93b8b0049932
child 25847 56674fd6dabc
--- a/mercurial/progress.py	Mon Jun 15 13:31:22 2015 -0500
+++ b/mercurial/progress.py	Tue Jun 16 14:11:58 2015 -0400
@@ -17,8 +17,8 @@
     return ' '.join(s for s in args if s)
 
 def shouldprint(ui):
-    return not ui.plain() and (ui._isatty(sys.stderr) or
-                               ui.configbool('progress', 'assume-tty'))
+    return not (ui.quiet or ui.plain()) and (
+        ui._isatty(sys.stderr) or ui.configbool('progress', 'assume-tty'))
 
 def fmtremaining(seconds):
     """format a number of remaining seconds in humain readable way
@@ -249,4 +249,3 @@
                         self.show(now, topic, *self.topicstates[topic])
         finally:
             self._refreshlock.release()
-