changeset 953 | 52d8d81e72ad |
parent 691 | 61c6b4178b9e |
parent 951 | 859de3ebc041 |
child 960 | abfb5cc97fcd |
--- a/mercurial/ui.py Fri Aug 19 16:43:30 2005 -0800 +++ b/mercurial/ui.py Fri Aug 19 16:45:25 2005 -0800 @@ -13,7 +13,8 @@ def __init__(self, verbose=False, debug=False, quiet=False, interactive=True): self.cdata = ConfigParser.SafeConfigParser() - self.cdata.read(os.path.expanduser("~/.hgrc")) + self.cdata.read([os.path.normpath(hgrc) for hgrc in + "/etc/mercurial/hgrc", os.path.expanduser("~/.hgrc")]) self.quiet = self.configbool("ui", "quiet") self.verbose = self.configbool("ui", "verbose")