Mercurial > hg
view tests/test-issue6642.t @ 51645:ff523675cd69
obsolete: simplify relevantmarker
Drop duplicate assignment from a merge failure. Save
one loop iteration by exploiting that pendingnodes will
be seennodes after the first round anyway, so just
pre-initialize the set accordingly. From Anton Shestakov's
review on !867. Performance difference for my test case is
in the noise.
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Mon, 24 Jun 2024 03:16:52 +0200 |
parents | 7e5be4a7cda7 |
children |
line wrap: on
line source
hg log --debug shouldn't show different data than {file_*} template keywords https://bz.mercurial-scm.org/show_bug.cgi?id=6642 $ hg init issue6642 $ cd issue6642 $ echo a > a $ hg ci -qAm a $ echo b > b $ hg ci -qAm b $ hg up 0 -q $ echo c > c $ hg ci -qAm c $ hg merge -q $ hg ci -m merge $ hg log -GT '{rev} {desc} file_adds: [{file_adds}], file_mods: [{file_mods}], file_dels: [{file_dels}], files: [{files}]\n' @ 3 merge file_adds: [], file_mods: [], file_dels: [], files: [] |\ | o 2 c file_adds: [c], file_mods: [], file_dels: [], files: [c] | | o | 1 b file_adds: [b], file_mods: [], file_dels: [], files: [b] |/ o 0 a file_adds: [a], file_mods: [], file_dels: [], files: [a] $ hg log -r . --debug | grep files [1] $ hg log -r . --debug -T json | grep -E '(added|removed|modified)' "added": [], "modified": [], "removed": [], $ hg log -r . --debug -T xml | grep path <paths> </paths>