Mercurial > hg > pyhgsh

diff mercurial/ui.py @ 951:859de3ebc041

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 18 Aug 2005 21:35:36 +0100
parents 61c6b4178b9e
children 52d8d81e72ad
line wrap: on
line diff
--- a/mercurial/ui.py	Thu Aug 18 13:55:45 2005 +0100
+++ b/mercurial/ui.py	Thu Aug 18 21:35:36 2005 +0100
@@ -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")