This is an archive of the discontinued Mercurial Phabricator instance.

Differential D446

tests: use graph log in {latesttag} tests
ClosedPublic

Authored by martinvonz on Aug 18 2017, 4:48 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0e15d5ae52cf: tests: use graph log in {latesttag} tests
Summary

The tests are much easier to read if one does not have to re-read the
setup part all the time to understand the graph shape.

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.Aug 18 2017, 4:48 PM
indygreg accepted this revision.Aug 18 2017, 10:59 PM
This revision is now accepted and ready to land.Aug 18 2017, 10:59 PM
Closed by commit rHG0e15d5ae52cf: tests: use graph log in {latesttag} tests (authored by martinvonz). · Explain WhyAug 22 2017, 1:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-command-template.t (207 lines)

Diff 1151

tests/test-command-template.t

$ echo e >> head2 $ echo e >> head2
$ hg ci -m h2e -d '4 0' $ hg ci -m h2e -d '4 0'
$ hg merge -q $ hg merge -q
$ hg ci -m merge -d '5 -3600' $ hg ci -m merge -d '5 -3600'
No tag set: No tag set:
$ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
5: null+5 @ 5: null+5
4: null+4 |\
3: null+3 | o 4: null+4
2: null+3 | |
1: null+2 | o 3: null+3
0: null+1 | |
o | 2: null+3
|/
o 1: null+2
|
o 0: null+1
One common tag: longest path wins: One common tag: longest path wins:
$ hg tag -r 1 -m t1 -d '6 0' t1 $ hg tag -r 1 -m t1 -d '6 0' t1
$ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
6: t1+4 @ 6: t1+4
5: t1+3 |
4: t1+2 o 5: t1+3
3: t1+1 |\
2: t1+1 | o 4: t1+2
1: t1+0 | |
0: null+1 | o 3: t1+1
| |
o | 2: t1+1
|/
o 1: t1+0
|
o 0: null+1
One ancestor tag: more recent wins: One ancestor tag: more recent wins:
$ hg tag -r 2 -m t2 -d '7 0' t2 $ hg tag -r 2 -m t2 -d '7 0' t2
$ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
7: t2+3 @ 7: t2+3
6: t2+2 |
5: t2+1 o 6: t2+2
4: t1+2 |
3: t1+1 o 5: t2+1
2: t2+0 |\
1: t1+0 | o 4: t1+2
0: null+1 | |
| o 3: t1+1
| |
o | 2: t2+0
|/
o 1: t1+0
|
o 0: null+1
Two branch tags: more recent wins: Two branch tags: more recent wins:
$ hg tag -r 3 -m t3 -d '8 0' t3 $ hg tag -r 3 -m t3 -d '8 0' t3
$ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
8: t3+5 @ 8: t3+5
7: t3+4 |
6: t3+3 o 7: t3+4
5: t3+2 |
4: t3+1 o 6: t3+3
3: t3+0 |
2: t2+0 o 5: t3+2
1: t1+0 |\
0: null+1 | o 4: t3+1
| |
| o 3: t3+0
| |
o | 2: t2+0
|/
o 1: t1+0
|
o 0: null+1
Merged tag overrides: Merged tag overrides:
$ hg tag -r 5 -m t5 -d '9 0' t5 $ hg tag -r 5 -m t5 -d '9 0' t5
$ hg tag -r 3 -m at3 -d '10 0' at3 $ hg tag -r 3 -m at3 -d '10 0' at3
$ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
10: t5+5 @ 10: t5+5
9: t5+4 |
8: t5+3 o 9: t5+4
7: t5+2 |
6: t5+1 o 8: t5+3
5: t5+0 |
4: at3:t3+1 o 7: t5+2
3: at3:t3+0 |
2: t2+0 o 6: t5+1
1: t1+0 |
0: null+1 o 5: t5+0
|\
$ hg log --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" | o 4: at3:t3+1
10: t5+5,5 | |
9: t5+4,4 | o 3: at3:t3+0
8: t5+3,3 | |
7: t5+2,2 o | 2: t2+0
6: t5+1,1 |/
5: t5+0,0 o 1: t1+0
4: at3+1,1 t3+1,1 |
3: at3+0,0 t3+0,0 o 0: null+1
2: t2+0,0
1: t1+0,0
0: null+1,1 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
@ 10: t5+5,5
$ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
10: t3, C: 8, D: 7 o 9: t5+4,4
9: t3, C: 7, D: 6 |
8: t3, C: 6, D: 5 o 8: t5+3,3
7: t3, C: 5, D: 4 |
6: t3, C: 4, D: 3 o 7: t5+2,2
5: t3, C: 3, D: 2 |
4: t3, C: 1, D: 1 o 6: t5+1,1
3: t3, C: 0, D: 0 |
2: t1, C: 1, D: 1 o 5: t5+0,0
1: t1, C: 0, D: 0 |\
0: null, C: 1, D: 1 | o 4: at3+1,1 t3+1,1
| |
| o 3: at3+0,0 t3+0,0
| |
o | 2: t2+0,0
|/
o 1: t1+0,0
|
o 0: null+1,1
$ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
@ 10: t3, C: 8, D: 7
|
o 9: t3, C: 7, D: 6
|
o 8: t3, C: 6, D: 5
|
o 7: t3, C: 5, D: 4
|
o 6: t3, C: 4, D: 3
|
o 5: t3, C: 3, D: 2
|\
| o 4: t3, C: 1, D: 1
| |
| o 3: t3, C: 0, D: 0
| |
o | 2: t1, C: 1, D: 1
|/
o 1: t1, C: 0, D: 0
|
o 0: null, C: 1, D: 1
$ cd .. $ cd ..
Style path expansion: issue1948 - ui.style option doesn't work on OSX Style path expansion: issue1948 - ui.style option doesn't work on OSX
if it is a relative path if it is a relative path
$ mkdir -p home/styles $ mkdir -p home/styles