##// END OF EJS Templates
merge with stable
Matt Mackall -
r23176:329c6b44 merge default
parent child Browse files
Show More
@@ -153,8 +153,6 b' def runsymbol(context, mapping, key):'
153 return v(**mapping)
153 return v(**mapping)
154 if isinstance(v, types.GeneratorType):
154 if isinstance(v, types.GeneratorType):
155 v = list(v)
155 v = list(v)
156 mapping[key] = v
157 return v
158 return v
156 return v
159
157
160 def buildfilter(exp, context):
158 def buildfilter(exp, context):
@@ -16,6 +16,12 b''
16 $ hg copy foo baz
16 $ hg copy foo baz
17 $ hg ci -m 'make bar and baz copies of foo' -d '2 0'
17 $ hg ci -m 'make bar and baz copies of foo' -d '2 0'
18 created new head
18 created new head
19
20 Test that template can print all file copies (issue4362)
21 $ hg log -r . --template "{file_copies % ' File: {file_copy}\n'}"
22 File: bar (foo)
23 File: baz (foo)
24
19 $ hg bookmark premerge1
25 $ hg bookmark premerge1
20 $ hg merge -r 1
26 $ hg merge -r 1
21 merging baz and foo to baz
27 merging baz and foo to baz
@@ -478,6 +478,12 b' The graft case'
478 date: Thu Jan 01 00:00:00 1970 +0000
478 date: Thu Jan 01 00:00:00 1970 +0000
479 summary: 2
479 summary: 2
480
480
481 Test that template correctly expands more than one 'extra' (issue4362)
482 $ hg -R ../converted log -r 7 --template "{extras % ' Extra: {extra}\n'}"
483 Extra: branch=default
484 Extra: convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
485 Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
486
481 The transplant case
487 The transplant case
482 $ hg -R ../converted log -r tip --template "{rev}: {node}\n{join(extras, '\n')}\n"
488 $ hg -R ../converted log -r tip --template "{rev}: {node}\n{join(extras, '\n')}\n"
483 21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
489 21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
General Comments 0
You need to be logged in to leave comments. Login now