changeset 25096:081b08e4ea13

templater: look for mapfiles in template paths This will allow %include statements to search the default template paths in addition to the directory where the %including file is.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 15 May 2015 09:07:27 -0400
parents 3182965b3971
children a4fce7905721
files mercurial/templater.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templater.py	Fri May 15 09:04:32 2015 -0400
+++ b/mercurial/templater.py	Fri May 15 09:07:27 2015 -0400
@@ -743,7 +743,7 @@
             raise util.Abort(_("style '%s' not found") % mapfile,
                              hint=_("available styles: %s") % stylelist())
 
-        conf = config.config()
+        conf = config.config(includepaths=templatepaths())
         conf.read(mapfile)
 
         for key, val in conf[''].items():