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

[Jordi Gutiérrez Hermoso]

# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh at 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.

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():