Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ui.py @ 3347:25d270e0b27f
ui.py: untangle updateopts
The code in ui.updateopts that handles ui.quiet, ui.verbose and
ui.debugflag is too smart, making it somewhat hard to see what
are the exact constraints placed on the values of these variables,
hiding some buglets.
This patch makes these constraints more explicit, fixing these
buglets and changing the behaviour slightly. It also adds a test
to make sure things work as expected in the future.
The buglets:
- setting ui.debug = True in a hgrc wouldn't turn on verbose mode
- additionally, setting ui.quiet = True or using --quiet would give
you a "quiet debug" mode.
The behaviour change:
- previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e.
the final result would be quiet mode), but --verbose wins against
--quiet
- now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet.
As a consequence, using -qv always gives you normal mode (unless
debug mode was turned on somewhere)
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Tue, 10 Oct 2006 18:43:20 -0300 |
| parents | bce7c1b4c1c8 |
| children | ab900698b832 |
line wrap: on
line diff
--- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -55,14 +55,29 @@ 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) and not self.quiet - self.debugflag = (self.debugflag or debug) + self.quiet = self.quiet or quiet + self.verbose = self.verbose or verbose + self.debugflag = self.debugflag or debug + + self.verbosity_constraints(quiet, verbose, debug) + self.interactive = (self.interactive and interactive) self.traceback = self.traceback or traceback for section, name, value in config: self.setconfig(section, name, value) + def verbosity_constraints(self, quiet, verbose, debug): + if self.debugflag: + self.verbose = True + self.quiet = False + elif self.verbose and self.quiet: + if quiet and not verbose: + self.verbose = False + elif not quiet and verbose: + self.quiet = False + else: + self.quiet = self.verbose = False + def readconfig(self, fn, root=None): if isinstance(fn, basestring): fn = [fn]