Mercurial > hg > pyhgsh

diff mercurial/ui.py @ 953:52d8d81e72ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Fri, 19 Aug 2005 16:45:25 -0800
parents 61c6b4178b9e 859de3ebc041
children abfb5cc97fcd
line wrap: on
line diff
--- 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")