Mercurial > hg
changeset 42375:7a64ad3f325d
tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
Differential Revision: https://phab.mercurial-scm.org/D6368
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 11 May 2019 00:06:06 -0700 |
| parents | 65fa61ca20af |
| children | e2e507573c7c |
| files | tests/test-template-keywords.t |
| diffstat | 1 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-template-keywords.t Thu Apr 18 13:34:20 2019 -0700 +++ b/tests/test-template-keywords.t Sat May 11 00:06:06 2019 -0700 @@ -798,6 +798,23 @@ fourth third +Test files lists on merge commit: + + $ hg co '.^' -q + $ touch c + $ hg add c + $ hg ci -qm 'add file' + $ hg merge 10 -q + $ hg ci -m 'merge' + $ hg log -l1 -T '{files}\n' + a fourth + $ hg log -l1 -T '{file_mods}\n' + third + $ hg log -l1 -T '{file_adds}\n' + b fifth + $ hg log -l1 -T '{file_dels}\n' + a fourth + Test file copies dict: $ hg log -r8 -T '{join(file_copies, " ")}\n' @@ -818,7 +835,7 @@ Test file attributes: - $ hg log -l1 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}' + $ hg log -r10 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}' R a A 0 b A 7 fifth @@ -834,7 +851,7 @@ Test index keyword: - $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n' + $ hg log -r 10:9 -T '{index + 10}{files % " {index}:{file}"}\n' 10 0:a 1:b 2:fifth 3:fourth 4:third 11 0:a