Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatekw.py @ 42424:0c72eddb4be5
templatekw: make {file_*} compare to both merge parents (issue4292)
This redefines the {file_adds}, {file_dels}, {file_mods} template
keywords by getting the lists from the recently introduced context
methods instead of getting them from status compared to p1. As
mentioned before, these are better defined on merge commits. The total
number of files from the three lists now always add up to the number
of files in {files}.
I timed this command:
hg log -r 4.0::5.0 -T '{rev}\n {file_mods}\n {file_adds}\n {file_dels}\n'
It went from 7.6s to 5.6s with this patch. So it's actually faster
than before.
Note that the "files:" field in the bazaar test log output was using
"{file_mods}" (not "{files}" as one might think based on the label).
Differential Revision: https://phab.mercurial-scm.org/D6369
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 18 Apr 2019 13:35:02 -0700 |
| parents | b47e9712000b |
| children | dc5bd66a8270 |
line wrap: on
line diff
--- a/mercurial/templatekw.py Fri May 31 09:25:51 2019 -0700 +++ b/mercurial/templatekw.py Thu Apr 18 13:35:02 2019 -0700 @@ -290,11 +290,6 @@ statmap.update((f, char) for f in files) return revcache['filestatusmap'] # {path: statchar} -def _showfilesbystat(context, mapping, name, index): - stat = _getfilestatus(context, mapping) - files = stat[index] - return templateutil.compatfileslist(context, mapping, name, files) - @templatekeyword('file_copies', requires={'repo', 'ctx', 'cache', 'revcache'}) def showfilecopies(context, mapping): @@ -332,17 +327,23 @@ @templatekeyword('file_adds', requires={'ctx', 'revcache'}) def showfileadds(context, mapping): """List of strings. Files added by this changeset.""" - return _showfilesbystat(context, mapping, 'file_add', 1) + ctx = context.resource(mapping, 'ctx') + return templateutil.compatfileslist(context, mapping, 'file_add', + ctx.filesadded()) @templatekeyword('file_dels', requires={'ctx', 'revcache'}) def showfiledels(context, mapping): """List of strings. Files removed by this changeset.""" - return _showfilesbystat(context, mapping, 'file_del', 2) + ctx = context.resource(mapping, 'ctx') + return templateutil.compatfileslist(context, mapping, 'file_del', + ctx.filesremoved()) @templatekeyword('file_mods', requires={'ctx', 'revcache'}) def showfilemods(context, mapping): """List of strings. Files modified by this changeset.""" - return _showfilesbystat(context, mapping, 'file_mod', 0) + ctx = context.resource(mapping, 'ctx') + return templateutil.compatfileslist(context, mapping, 'file_mod', + ctx.filesmodified()) @templatekeyword('files', requires={'ctx'}) def showfiles(context, mapping):