Patchwork [2,of,2,V4] templater: look for mapfiles in template paths

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date May 15, 2015, 3:23 p.m.
Message ID <e8649a49016b4be8ad6f.1431703419@Iris>
Download mbox | patch
Permalink /patch/9101/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - May 15, 2015, 3:23 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1431695247 14400
#      Fri May 15 09:07:27 2015 -0400
# Node ID e8649a49016b4be8ad6fac766f408b3ee30c6b31
# Parent  a5f23191d2ba984ded287675452bea072fde5b1f
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.
Matt Mackall - May 15, 2015, 4:22 p.m.
On Fri, 2015-05-15 at 11:23 -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1431695247 14400
> #      Fri May 15 09:07:27 2015 -0400
> # Node ID e8649a49016b4be8ad6fac766f408b3ee30c6b31
> # Parent  a5f23191d2ba984ded287675452bea072fde5b1f
> templater: look for mapfiles in template paths

These are queued for default, thanks.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -743,7 +743,7 @@  class templater(object):
             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():