Mercurial > hg
changeset 18716:963468e9f9e5
merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 22 Feb 2013 13:46:54 -0600 |
| parents | c4ff927b6f68 (diff) 7790d69af6d6 (current diff) |
| children | fcc4b55876c3 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templatekw.py Fri Feb 22 10:05:22 2013 -0800 +++ b/mercurial/templatekw.py Fri Feb 22 13:46:54 2013 -0600 @@ -244,8 +244,8 @@ copies.append((fn, rename[0])) c = [{'name': x[0], 'source': x[1]} for x in copies] - return showlist('file_copy', c, plural='file_copies', - element='file', **args) + f = _showlist('file_copy', c, plural='file_copies', **args) + return _hybrid(f, c) # showfilecopiesswitch() displays file copies only if copy records are # provided before calling the templater, usually with a --copies @@ -256,8 +256,8 @@ """ copies = args['revcache'].get('copies') or [] c = [{'name': x[0], 'source': x[1]} for x in copies] - return showlist('file_copy', c, plural='file_copies', - element='file', **args) + f = _showlist('file_copy', c, plural='file_copies', **args) + return _hybrid(f, c) def showfiledels(**args): """:file_dels: List of strings. Files removed by this changeset."""
--- a/tests/test-command-template.t Fri Feb 22 10:05:22 2013 -0800 +++ b/tests/test-command-template.t Fri Feb 22 13:46:54 2013 -0600 @@ -43,6 +43,9 @@ $ hg mv second fourth $ hg commit -m third -d "2020-01-01 10:01" + $ hg log --template '{file_copies % "{source} -> {name}\n"}' -r . + second -> fourth + Quoting for ui.logtemplate $ hg tip --config "ui.logtemplate={rev}\n"