# HG changeset patch # User mpm@selenic.com # Date 1127529323 25200 # Node ID 0f4e53e8c66b4abd0e493b22a59d0b80aa2b33c4 # Parent 5a42da1db40237239e5490c6956bccc2153aa5f8 Add support for /etc/mercurial/hgrc.d/*.rc diff -r 5a42da1db402 -r 0f4e53e8c66b mercurial/util.py --- 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"""