This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6368

tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
ClosedPublic

Authored by martinvonz on May 11 2019, 3:18 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7a64ad3f325d: tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.May 11 2019, 3:18 AM
martinvonz updated this revision to Diff 15080.May 14 2019, 6:58 PM
martinvonz updated this revision to Diff 15152.May 16 2019, 1:41 PM
pulkit added a subscriber: pulkit.May 25 2019, 1:11 PM
pulkit added inline comments.
mercurial/context.py
469 ↗(On Diff #15152)

This change should be part of previous patch right? (I can fold that in previous change in flight)

martinvonz added inline comments.May 25 2019, 1:35 PM
mercurial/context.py
469 ↗(On Diff #15152)

Yes, thanks for noticing and fixing. I fixed it in my repo, but I must have forgotten to update it here.

Closed by commit rHG7a64ad3f325d: tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit (authored by martinvonz). · Explain WhyMay 25 2019, 6:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-template-keywords.t (21 lines)

Diff 15265

tests/test-template-keywords.t

third third
$ hg log -l1 -T '{files % "{path}\n"}' $ hg log -l1 -T '{files % "{path}\n"}'
a a
b b
fifth fifth
fourth fourth
third 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: Test file copies dict:
$ hg log -r8 -T '{join(file_copies, " ")}\n' $ hg log -r8 -T '{join(file_copies, " ")}\n'
fourth (second) fourth (second)
$ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}' $ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
fourth <- second fourth <- second
$ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}' $ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'
fourth <- second fourth <- second
$ hg log -r8 -T '{join(file_copies_switch, " ")}\n' $ hg log -r8 -T '{join(file_copies_switch, " ")}\n'
$ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n' $ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'
fourth (second) fourth (second)
$ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}' $ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'
fourth <- second fourth <- second
$ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}' $ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'
fourth <- second fourth <- second
Test file attributes: 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 R a
A 0 b A 0 b
A 7 fifth A 7 fifth
R fourth R fourth
M 13 third M 13 third
Test file status including clean ones: Test file status including clean ones:
$ hg log -r9 -T '{files("**") % "{status} {path}\n"}' $ hg log -r9 -T '{files("**") % "{status} {path}\n"}'
A a A a
C fourth C fourth
C third C third
Test index keyword: 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 10 0:a 1:b 2:fifth 3:fourth 4:third
11 0:a 11 0:a
$ hg branches -T '{index} {branch}\n' $ hg branches -T '{index} {branch}\n'
0 default 0 default
1 foo 1 foo
p1/p2 keywords: p1/p2 keywords: