equal
deleted
inserted
replaced
20 self.quiet = self.configbool("ui", "quiet") |
20 self.quiet = self.configbool("ui", "quiet") |
21 self.verbose = self.configbool("ui", "verbose") |
21 self.verbose = self.configbool("ui", "verbose") |
22 self.debugflag = self.configbool("ui", "debug") |
22 self.debugflag = self.configbool("ui", "debug") |
23 self.interactive = self.configbool("ui", "interactive", True) |
23 self.interactive = self.configbool("ui", "interactive", True) |
24 |
24 |
|
25 self.updateopts(verbose, debug, quiet, interactive) |
|
26 |
|
27 def updateopts(self, verbose=False, debug=False, quiet=False, |
|
28 interactive=True): |
25 self.quiet = (self.quiet or quiet) and not verbose and not debug |
29 self.quiet = (self.quiet or quiet) and not verbose and not debug |
26 self.verbose = (self.verbose or verbose) or debug |
30 self.verbose = (self.verbose or verbose) or debug |
27 self.debugflag = (self.debugflag or debug) |
31 self.debugflag = (self.debugflag or debug) |
28 self.interactive = (self.interactive and interactive) |
32 self.interactive = (self.interactive and interactive) |
29 |
33 |
60 for section in self.cdata.sections(): |
64 for section in self.cdata.sections(): |
61 for name, value in self.cdata.items(section): |
65 for name, value in self.cdata.items(section): |
62 if (section, name) in seen: continue |
66 if (section, name) in seen: continue |
63 yield section, name, value.replace('\n', '\\n') |
67 yield section, name, value.replace('\n', '\\n') |
64 seen[section, name] = 1 |
68 seen[section, name] = 1 |
|
69 |
|
70 def extensions(self): |
|
71 return self.configitems("extensions") |
65 |
72 |
66 def username(self): |
73 def username(self): |
67 return (os.environ.get("HGUSER") or |
74 return (os.environ.get("HGUSER") or |
68 self.config("ui", "username") or |
75 self.config("ui", "username") or |
69 os.environ.get("EMAIL") or |
76 os.environ.get("EMAIL") or |