diff mercurial/templater.py @ 25580:a69983942fb4

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 15 Jun 2015 13:31:22 -0500
parents 576d6c74784b 9452112c8eb0
children a7dd6692e5cb
line wrap: on
line diff
--- a/mercurial/templater.py	Wed May 27 13:22:48 2015 -0700
+++ b/mercurial/templater.py	Mon Jun 15 13:31:22 2015 -0500
@@ -266,7 +266,7 @@
 
     def getpatterns(i):
         if i < len(args):
-            s = args[i][1].strip()
+            s = stringify(args[i][0](context, mapping, args[i][1])).strip()
             if s:
                 return [s]
         return []