D6368: tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat May 25 18:54:27 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7a64ad3f325d: tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit (authored by martinvonz, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D6368?vs=15152&id=15265#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6368?vs=15152&id=15265
REVISION DETAIL
https://phab.mercurial-scm.org/D6368
AFFECTED FILES
tests/test-template-keywords.t
CHANGE DETAILS
diff --git a/tests/test-template-keywords.t b/tests/test-template-keywords.t
--- a/tests/test-template-keywords.t
+++ b/tests/test-template-keywords.t
@@ -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
To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list