Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/ui.py @ 3347:25d270e0b27f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3346:e4aa22eaa0e4 3347:25d270e0b27f
53 def __getattr__(self, key): 53 def __getattr__(self, key):
54 return getattr(self.parentui, key) 54 return getattr(self.parentui, key)
55 55
56 def updateopts(self, verbose=False, debug=False, quiet=False, 56 def updateopts(self, verbose=False, debug=False, quiet=False,
57 interactive=True, traceback=False, config=[]): 57 interactive=True, traceback=False, config=[]):
58 self.quiet = (self.quiet or quiet) and not verbose and not debug 58 self.quiet = self.quiet or quiet
59 self.verbose = ((self.verbose or verbose) or debug) and not self.quiet 59 self.verbose = self.verbose or verbose
60 self.debugflag = (self.debugflag or debug) 60 self.debugflag = self.debugflag or debug
61
62 self.verbosity_constraints(quiet, verbose, debug)
63
61 self.interactive = (self.interactive and interactive) 64 self.interactive = (self.interactive and interactive)
62 self.traceback = self.traceback or traceback 65 self.traceback = self.traceback or traceback
63 for section, name, value in config: 66 for section, name, value in config:
64 self.setconfig(section, name, value) 67 self.setconfig(section, name, value)
68
69 def verbosity_constraints(self, quiet, verbose, debug):
70 if self.debugflag:
71 self.verbose = True
72 self.quiet = False
73 elif self.verbose and self.quiet:
74 if quiet and not verbose:
75 self.verbose = False
76 elif not quiet and verbose:
77 self.quiet = False
78 else:
79 self.quiet = self.verbose = False
65 80
66 def readconfig(self, fn, root=None): 81 def readconfig(self, fn, root=None):
67 if isinstance(fn, basestring): 82 if isinstance(fn, basestring):
68 fn = [fn] 83 fn = [fn]
69 for f in fn: 84 for f in fn: