Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/ui.py @ 3035:1efd5a6df5a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not enable verbose output if quiet is specified in the cmdline
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 03 Sep 2006 02:28:39 +0200
parents 01454af644b8
children 24c1db20990c
line wrap: on
line diff
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -54,7 +54,7 @@ class ui(object):
     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