Mercurial > hg > mercurial-crew

changeset 10042:7cdd2a7db2c2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: raise ConfigError on non-existing include files Before, an %include directive for a non-existing file resulted in an IOError and a traceback.
author Martin Geisler <mg@lazybytes.net>
date Sat, 12 Dec 2009 16:46:16 +0100 (2009-12-12)
parents fb45c1e4396f
children dc5462d94a72 27267b1f68b4
files mercurial/config.py tests/test-hgrc tests/test-hgrc.out
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -100,7 +100,13 @@
                 base = os.path.dirname(src)
                 inc = os.path.normpath(os.path.join(base, inc))
                 if include:
-                    include(inc, remap=remap, sections=sections)
+                    try:
+                        include(inc, remap=remap, sections=sections)
+                    except IOError, inst:
+                        msg = _("config error at %s:%d: "
+                                "cannot include %s (%s)") \
+                            % (src, line, inc, inst.strerror)
+                        raise error.ConfigError(msg)
                 continue
             if emptyre.match(l):
                 continue
--- a/tests/test-hgrc
+++ b/tests/test-hgrc
@@ -22,3 +22,6 @@
 echo '[foo]' >> $HGRCPATH
 echo '  x = y' >> $HGRCPATH
 hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
+
+echo '%include /no-such-file' > $HGRCPATH
+hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
--- a/tests/test-hgrc.out
+++ b/tests/test-hgrc.out
@@ -11,3 +11,4 @@
 paths.default=.../foo%bar
 ui.slash=True
 hg: config error at $HGRCPATH:8: '  x = y'
+hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)