##// END OF EJS Templates
templatekw: make {file_*} compare to both merge parents (issue4292)...
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

File last commit:

r42597:0c72eddb default
r42597:0c72eddb default
Show More
next
56 lines | 2.0 KiB | text/plain | TextLexer
== New Features ==
* New config `commands.commit.post-status` shows status after successful
commit.
== New Experimental Features ==
* New config `experimental.log.topo` makes `hg log -G` use
topological sorting. This is especially useful for aliases since it
lets the alias accept an `-r` option while still using topological
sorting with or without the `-r` (unlike if you use the `sort(...,
topo)` revset).
== Bug Fixes ==
* issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}
in template show wrong files on merged revision". See details in
"Backwards Compatibility Changes".
== Backwards Compatibility Changes ==
* Removed (experimental) support for log graph lines mixing
parent/grandparent styles. Setting
e.g. `experimental.graphstyle.parent = !` and
`experimental.graphstyle.grandparent = 3.` would use `!` for the
first three lines of the graph and then `.`. This is no longer
supported.
* If `ui.origbackuppath` had been (incorrectly) configured to point
to a file, we will now replace that file by a directory and put
backups in that directory. This is similar to how we would
previously replace files *in* the configured directory by
subdirectories.
* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}`
have changed behavior on merge commits. They used to be relative to
the first parent, but they now consider both parents. `{file_adds}`
shows files that exists in the commit but did not exist in either
parent. `{file_dels}` shows files that do not exist in the commit
but existed in either parent. `{file_mods}` show the remaining
files from `{files}` that were not in the other two
sets.
== Internal API Changes ==
* Matchers are no longer iterable. Use `match.files()` instead.
* `match.visitdir()` and `match.visitchildrenset()` now expect the
empty string instead of '.' to indicate the root directory.
* `util.dirs()` and `util.finddirs()` now include an entry for the
root directory (empty string).