Mercurial > public > mercurial-scm > hg-stable

diff mercurial/config.py @ 11224:f23f87462c18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: expand hgrc %include paths
author Chad Dombrova <chadrik@gmail.com>
date Wed, 26 May 2010 14:03:29 -0700
parents 44c923eeb81d
children 2123aad24d56
line wrap: on
line diff
--- a/mercurial/config.py	Wed May 26 16:16:47 2010 +0200
+++ b/mercurial/config.py	Wed May 26 14:03:29 2010 -0700
@@ -6,7 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
-import error
+import error, util
 import re, os
 
 class sortdict(dict):
@@ -96,7 +96,7 @@
                 cont = False
             m = includere.match(l)
             if m:
-                inc = m.group(1)
+                inc = util.expandpath(m.group(1))
                 base = os.path.dirname(src)
                 inc = os.path.normpath(os.path.join(base, inc))
                 if include: