Mercurial > hg > pyhgsh

changeset 1343:0f4e53e8c66b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for /etc/mercurial/hgrc.d/*.rc
author mpm@selenic.com
date Fri, 23 Sep 2005 19:35:23 -0700
parents 5a42da1db402
children ca0e27e05de3
files mercurial/util.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Fri Sep 23 19:04:19 2005 -0700
+++ b/mercurial/util.py	Fri Sep 23 19:35:23 2005 -0700
@@ -426,8 +426,12 @@
 else:
     nulldev = '/dev/null'
 
-    rcpath = map(os.path.normpath,
-                 ('/etc/mercurial/hgrc', os.path.expanduser('~/.hgrc')))
+    hgrcd = '/etc/mercurial/hgrc.d'
+    hgrcs = []
+    if os.path.isdir(hgrcd):
+        hgrcs = [f for f in os.listdir(hgrcd) if f.endswith(".rc")]
+    rcpath = map(os.path.normpath, hgrcs +
+                 ['/etc/mercurial/hgrc', os.path.expanduser('~/.hgrc')])
 
     def parse_patch_output(output_line):
         """parses the output produced by patch and returns the file name"""