# HG changeset patch # User Jordi Gutiérrez Hermoso <jordigh@octave.org> # Date 1431695247 14400 # Fri May 15 09:07:27 2015 -0400 # Node ID 081b08e4ea1350f5c501b0ae0915547b8acc5503 # Parent 3182965b39710bad623e3dfb6d3c4f048375d2f4 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. diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -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():