Mercurial > hg

changeset 3038: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 3acb76f0124d
children 77637938d43d
files mercurial/ui.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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