Patchwork [5,of,7] templater: don't search randomly for templates - trust util.datapath

login
register
mail settings
Submitter Mads Kiilerich
Date Sept. 28, 2014, 3:03 p.m.
Message ID <8ab3da1c749ebbb3a1b7.1411916582@localhost.localdomain>
Download mbox | patch
Permalink /patch/6008/
State Accepted
Headers show

Comments

Mads Kiilerich - Sept. 28, 2014, 3:03 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1411916257 -7200
#      Sun Sep 28 16:57:37 2014 +0200
# Node ID 8ab3da1c749ebbb3a1b7111ebccbffb2a497b600
# Parent  bfb29147145157d7f8f0c312867cddda4f0ab72d
templater: don't search randomly for templates - trust util.datapath

The search was introduced in 2653740d8118. It might have been necessary back
then when using __file__ directly and frozen-ness wasn't considered. Now we
should know exactly where the templates can be found.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -711,7 +711,7 @@  class templater(object):
 
 def templatepaths():
     '''return locations used for template files.'''
-    pathsrel = ['templates', '../templates']
+    pathsrel = ['templates']
     paths = [os.path.normpath(os.path.join(util.datapath, f))
              for f in pathsrel]
     return [p for p in paths if os.path.isdir(p)]