Comments
Patch
@@ -296,7 +296,7 @@
joiner = " "
if len(args) > 1:
- joiner = args[1][0](context, mapping, args[1][1])
+ joiner = stringify(args[1][0](context, mapping, args[1][1]))
first = True
for x in joinset:
@@ -328,9 +328,9 @@
if not (1 <= len(args) <= 2):
raise error.ParseError(_("strip expects one or two arguments"))
- text = args[0][0](context, mapping, args[0][1])
+ text = stringify(args[0][0](context, mapping, args[0][1]))
if len(args) == 2:
- chars = args[1][0](context, mapping, args[1][1])
+ chars = stringify(args[1][0](context, mapping, args[1][1]))
return text.strip(chars)
return text.strip()
@@ -1659,3 +1659,12 @@
$ hg log -r 0 --template '{if(branches, "yes", "no")}\n'
no
+
+ $ cd ..
+
+Test stringify on sub expressions
+
+ $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n'
+ fourth, second, third
+ $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n'
+ abc