Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/ui.py @ 1483:a4ba63e04134

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix traceback on bad system hgrc files
author Soh Tk-r28629 <tksoh@freescale.com>
date Mon, 31 Oct 2005 09:57:54 -0800
parents 7d66ce9895fa
children 59b3639df0a9
comparison
equal deleted inserted replaced
1482:4d38b85e60aa 1483:a4ba63e04134
30 self.verbose = (self.verbose or verbose) or debug 30 self.verbose = (self.verbose or verbose) or debug
31 self.debugflag = (self.debugflag or debug) 31 self.debugflag = (self.debugflag or debug)
32 self.interactive = (self.interactive and interactive) 32 self.interactive = (self.interactive and interactive)
33 33
34 def readconfig(self, fn): 34 def readconfig(self, fn):
35 try: 35 if isinstance(fn, basestring):
36 self.cdata.read(fn) 36 fn = [fn]
37 except ConfigParser.ParsingError, inst: 37 for f in fn:
38 raise util.Abort(_("Failed to parse %s\n%s") % (fn, inst)) 38 try:
39 self.cdata.read(f)
40 except ConfigParser.ParsingError, inst:
41 raise util.Abort(_("Failed to parse %s\n%s") % (f, inst))
39 42
40 def setconfig(self, section, name, val): 43 def setconfig(self, section, name, val):
41 self.overlay[(section, name)] = val 44 self.overlay[(section, name)] = val
42 45
43 def config(self, section, name, default=None): 46 def config(self, section, name, default=None):