mercurial/ui.py
changeset 3038 1efd5a6df5a3
parent 3014 01454af644b8
child 3073 24c1db20990c
--- a/mercurial/ui.py	Sat Sep 02 23:26:10 2006 +0200
+++ b/mercurial/ui.py	Sun Sep 03 02:28:39 2006 +0200
@@ -54,7 +54,7 @@
     def updateopts(self, verbose=False, debug=False, quiet=False,
                    interactive=True, traceback=False, config=[]):
         self.quiet = (self.quiet or quiet) and not verbose and not debug
-        self.verbose = (self.verbose or verbose) or debug
+        self.verbose = ((self.verbose or verbose) or debug) and not self.quiet
         self.debugflag = (self.debugflag or debug)
         self.interactive = (self.interactive and interactive)
         self.traceback = self.traceback or traceback