Mercurial > public > mercurial-scm > hg
diff mercurial/templater.py @ 22843:b6531d806de8 stable
templater: fix ifcontains when list is a string (issue4399)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 10 Oct 2014 11:38:00 -0500 |
parents | 2896d450fec4 |
children | 1533e642262d |
line wrap: on
line diff
--- a/mercurial/templater.py Wed Oct 08 07:47:11 2014 -0400 +++ b/mercurial/templater.py Fri Oct 10 11:38:00 2014 -0500 @@ -312,7 +312,8 @@ # Iterating over items gives a formatted string, so we iterate # directly over the raw values. - if item in [i.values()[0] for i in items()]: + if ((callable(items) and item in [i.values()[0] for i in items()]) or + (isinstance(items, str) and item in items)): yield _evalifliteral(args[2], context, mapping) elif len(args) == 4: yield _evalifliteral(args[3], context, mapping)