comparison mercurial/ui.py @ 349:b2293093b89e

Merged with mercurial-identify (which includes upstream's current tip) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merged with mercurial-identify (which includes upstream's current tip) manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO yZTmrT6p+gt6GBO+j5FVBn0= =HWn8 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 15 Jun 2005 08:32:29 +0100
parents 5a1e6d27f399 c3d873ef4b31
children b4e0e20646bb
comparison
equal deleted inserted replaced
348:442eb02cf870 349:b2293093b89e
20 20
21 self.quiet = (self.quiet or quiet) and not verbose and not debug 21 self.quiet = (self.quiet or quiet) and not verbose and not debug
22 self.verbose = (self.verbose or verbose) or debug 22 self.verbose = (self.verbose or verbose) or debug
23 self.debugflag = (self.debugflag or debug) 23 self.debugflag = (self.debugflag or debug)
24 self.interactive = (self.interactive and interactive) 24 self.interactive = (self.interactive and interactive)
25
26 def readconfig(self, fp):
27 self.cdata.readfp(fp)
25 28
26 def config(self, section, val, default=None): 29 def config(self, section, val, default=None):
27 if self.cdata.has_option(section, val): 30 if self.cdata.has_option(section, val):
28 return self.cdata.get(section, val) 31 return self.cdata.get(section, val)
29 return default 32 return default