# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1455376692 -32400
# Node ID e9137163312768ad607faefc85207cf477dd3fae
# Parent  2874db5462d3493be40500a208ae1e43e25d7064
templater: fix ifcontains() to evaluate items argument eagerly

See the previous patch for why. An "items" argument may be a string,
a generator, or an arbitrary container object.

diff -r 2874db5462d3 -r e91371633127 mercurial/templater.py
--- a/mercurial/templater.py	Sun Feb 14 00:05:58 2016 +0900
+++ b/mercurial/templater.py	Sun Feb 14 00:18:12 2016 +0900
@@ -466,7 +466,7 @@
         raise error.ParseError(_("ifcontains expects three or four arguments"))
 
     item = stringify(args[0][0](context, mapping, args[0][1]))
-    items = args[1][0](context, mapping, args[1][1])
+    items = evalfuncarg(context, mapping, args[1])
 
     if item in items:
         yield args[2][0](context, mapping, args[2][1])
diff -r 2874db5462d3 -r e91371633127 tests/test-command-template.t
--- a/tests/test-command-template.t	Sun Feb 14 00:05:58 2016 +0900
+++ b/tests/test-command-template.t	Sun Feb 14 00:18:12 2016 +0900
@@ -3248,6 +3248,11 @@
   1 is not
   0 is in the string
 
+  $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n'
+  2 is in the string
+  1 is not
+  0 is in the string
+
   $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n'
   2 did not add a
   1 did not add a