Mercurial > evolve

annotate tests/test-evolve-templates.t @ 2555:41a1d2a93223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: fix template condition for obsfate
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 08 Jun 2017 02:58:54 +0100
parents abe6dfbdc744
children 8412b0b7b512
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 This test file test the various templates for precursors and successors.
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
3 Global setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
4 ============
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
5
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
6 $ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 $ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8 > [ui]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 > interactive = true
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 > [phases]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 > publish=False
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12 > [extensions]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
13 > evolve =
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
14 > [alias]
2497
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2496
diff changeset
15 > tlog = log -G -T '{node|short}\
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2496
diff changeset
16 > {if(precursors, "\n Precursors: {precursors}")}\
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
2498
b765650b37ee template: skip "successors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2497
diff changeset
18 > {if(successors, "\n Successors: {successors}")}\
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
2555
41a1d2a93223 test: fix template condition for obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2546
diff changeset
20 > {if(obsfate_quiet, "\n Fate: {obsfate_quiet}")}\n'
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
21 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
22
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
23 Test templates on amended commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
24 ================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
25
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
26 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
27 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
28
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
29 $ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
30 $ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
31 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
32 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
33 $ echo 42 >> A0
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
34 $ hg amend -m "A1"
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
35 $ hg amend -m "A2"
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
36 $ hg log --hidden -G
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
37 @ changeset: 4:d004c8f274b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
38 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
39 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
40 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
41 | date: Thu Jan 01 00:00:00 1970 +0000
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
42 | summary: A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
43 |
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
44 | x changeset: 3:a468dc9b3633
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
45 |/ parent: 0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
46 | user: test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
47 | date: Thu Jan 01 00:00:00 1970 +0000
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
48 | summary: A1
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
49 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
50 | x changeset: 2:f137d23bb3e1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
51 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
52 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
53 | | summary: temporary amend commit for 471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
54 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
55 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
56 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
57 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
61 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
65 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
66 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
67 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
69 working directory parent is obsolete! (471f378eab4c)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
70 (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
71
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
72 Precursors template should show current revision as it is the working copy
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
73 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
74 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
75 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
76 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
77 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
78 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
79 | semi-colon: [d004c8f274b9]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
80 | Fate: superseed as d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
81 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
82
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
83 $ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
85 working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
86 (use 'hg evolve' to update to its successor: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
87
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
88 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
89 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
90 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
91 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
92 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
93 | @ a468dc9b3633
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
94 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
95 | semi-colon: [d004c8f274b9]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
96 | Fate: superseed as d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
97 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
98
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
99 Precursors template should show the precursor as we force its display with
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
100 --hidden
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
101 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
102 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
103 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
104 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
105 | @ a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
106 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
107 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
108 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
109 | semi-colon: [d004c8f274b9]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
110 | Fate: superseed as d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
111 | x f137d23bb3e1
2555
41a1d2a93223 test: fix template condition for obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2546
diff changeset
112 | | Fate: pruned
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
113 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
114 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
115 | semi-colon: [a468dc9b3633]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
116 | Fate: superseed as a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
117 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
118
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
119
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
120 $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
122 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
123 @ d004c8f274b9
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
124 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
125 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
126
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
127 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
128 @ d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
129 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
130 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
131 | x a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
132 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
133 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
134 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
135 | semi-colon: [d004c8f274b9]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
136 | Fate: superseed as d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
137 | x f137d23bb3e1
2555
41a1d2a93223 test: fix template condition for obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2546
diff changeset
138 | | Fate: pruned
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
139 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
140 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
141 | semi-colon: [a468dc9b3633]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
142 | Fate: superseed as a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
143 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
144
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
145
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
146 Test templates with splitted commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
147 ===================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
148
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
149 $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
150 $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
151 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
152 $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
153 $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
154 $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
155 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
156 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
157 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
158 @ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
159 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
160 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
161 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
162 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
163 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
164 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
165 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
166 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
167 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
168
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
169 $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
170 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
171 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
172 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
173 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
174 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
175 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
176 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
177 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
178 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
179 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
180 diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
181 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
182 examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
183
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
184 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
185 +42
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
186 record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
187
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
188 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
189 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
190 examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
191
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
192 created new head
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
193 Done splitting? [yN] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
194 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
195 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
196 examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
197
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
198 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
199 +43
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
200 record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
201
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
202 no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
203
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
204 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
205 @ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
206 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
207 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
208 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
209 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
210 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
211 o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
212 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
213 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
214 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
215 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
216 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
217 | x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
218 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
219 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
220 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
221 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
222 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
223 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
224 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
225 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
226
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
227
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
228 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
229 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
230
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
231 $ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
232 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
233 working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
234 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
235
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
236 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
237 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
238 o f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
239 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
240 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
241 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
242 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
243 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
244 | @ 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
245 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
246 | semi-colon: [337fec4d2edc, f257fde29c7a]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
247 | Fate: superseed as 337fec4d2edc,f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
248 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
249
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
250 $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
252
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
253 Precursors template should not show a precursor as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
254 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
255 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
256 @ f257fde29c7a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
257 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
258 o 337fec4d2edc
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
259 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
260 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
261
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
262 Precursors template should show the precursor as we force its display with
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
263 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
264 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
265 @ f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
266 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
267 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
268 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
269 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
270 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
271 | x 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
272 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
273 | semi-colon: [337fec4d2edc, f257fde29c7a]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
274 | Fate: superseed as 337fec4d2edc,f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
275 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
276
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
277 Test templates with folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
278 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
279
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
280 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
281 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
282
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
283 $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
284 $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
285 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
286 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
287 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
288 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
289 @ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
290 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
291 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
292 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
293 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
294 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
295 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
296 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
297 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
298 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
299 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
300 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
301 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
302 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
303 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
304
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
305 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
306 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
307 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
308 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
309 @ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
310 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
311 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
312 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
313 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
314 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
315 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
316 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
317 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
318 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
319 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
320 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
321 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
322 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
323 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
324 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
325 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
326 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
327 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
328 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
329 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
330
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
331 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
332 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
333
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
334 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
335 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
336 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
337 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
338
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
339 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
340 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
341 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
342 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
343 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
344 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
345 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
346 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
347 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
348 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
349
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
350 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
352 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
353 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
354
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
355 Precursors template should show both precursors as they should be both
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
356 displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
357 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
358 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
359 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
360 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
361 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
362 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
363 | | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
364 | | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
365 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
366 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
367 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
368 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
369 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
370
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
371 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
373
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
374 Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
375 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
376 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
377 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
378 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
379 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
380
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
381 Precursors template should show both precursors as we force its display with
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
382 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
383 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
384 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
385 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
386 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
387 | x 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
388 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
389 | | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
390 | | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
391 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
392 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
393 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
394 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
395 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
396
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
397
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
398 Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
399 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
400
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
401 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
402 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
403
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
404 $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
405 $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
406 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
407 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
408 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
409 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
410 @ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
411 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
412 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
413 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
414 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
415 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
416 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
417 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
418 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
419 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
420 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
421 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
422 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
423 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
424 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
425 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
426
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
427 $ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
428 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
429 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
430 (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
431 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
432 2 new divergent changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
433 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 @ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
435 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
436 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
437 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
438 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
439 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
440 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
441 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
442 | o changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
443 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
444 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
445 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
446 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
447 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
448 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
449 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
450 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
451 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
452 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
453 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
454 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
455 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
456 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
458
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
459 $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
460
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
461 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
462 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
463
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
464 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
465 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
466 working directory parent is obsolete! (471f378eab4c)
2546
abe6dfbdc744 evolve: fix typo: -list -> --list
Kyle Lippincott <spectral@google.com>
parents: 2502
diff changeset
467 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
468
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
469 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
470 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
471 o 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
472 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
473 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
474 | o fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
475 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
476 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
477 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
478 |/ Successors: [fdf9bde5129a], [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
479 | semi-colon: [fdf9bde5129a]; [019fadeab383]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
480 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
481 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
482
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
483 $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
484 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
485 Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
486 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
487 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
488 o 019fadeab383
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
489 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
490 | @ fdf9bde5129a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
491 |/
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
492 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
493
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
494 Precursors template should a precursor as we force its display with --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
495 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
496 o 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
497 | Precursors: 65b757b745b9
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
498 | semi-colon: 65b757b745b9
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
499 | x 65b757b745b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
500 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
501 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
502 | Successors: [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
503 | semi-colon: [019fadeab383]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
504 | Fate: superseed as 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
505 | @ fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
506 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
507 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
508 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
509 |/ Successors: [fdf9bde5129a], [65b757b745b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
510 | semi-colon: [fdf9bde5129a]; [65b757b745b9]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
511 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
512 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
513
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
514 Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
515 ===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
516
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
517 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
518 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
519
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
520 $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
521 $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
522 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
523 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
524 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
525 $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
526 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
527 @ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
528 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
529 | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
530 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
531 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
532 | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
533 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
534 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
535 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
536 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
537 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
538 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
539 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
540 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
541 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
542 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
543 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
544 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
545 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
546 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
547 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
548
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
549 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
550 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
552 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
553 @ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
554 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
555 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
556 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
557 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
558 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
559 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
560 | x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
561 | | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
562 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
563 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
564 | | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
565 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
566 | | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
567 | |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
568 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
569 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
570 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
571 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
572 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
573 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
574 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
575 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
576 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
577 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
578 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
579 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
580
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
581 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
582 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
583
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
584 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
585 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
586 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
587 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
588 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
589 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
590 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
591 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
592 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
593 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
594 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
595 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
596 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
597
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
598 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
599 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
600 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
601 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
603 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
604 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
605 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
606 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
607 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
608 | | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
609 | | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
610 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
611 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
612 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
613 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
614 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
615
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
616 $ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
618 working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
619 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
620 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
621 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
622 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
623 | semi-colon: 471f378eab4c; b7ea6d14e664
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
624 | @ b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
625 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
626 | | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
627 | | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
628 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
629 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
630 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
631 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
632 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
633
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
634 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
635 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
636 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
637 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
638 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
639 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
640
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
641 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
642 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
643 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
644 | semi-colon: 471f378eab4c; b7ea6d14e664
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
645 | x b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
646 | | Precursors: 0dec01379d3b
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
647 | | semi-colon: 0dec01379d3b
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
648 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
649 | | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
650 | | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
651 | | x 0dec01379d3b
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
652 | |/ Successors: [b7ea6d14e664]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
653 | | semi-colon: [b7ea6d14e664]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
654 | | Fate: superseed as b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
655 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
656 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
657 | semi-colon: [eb5a0daa2192]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
658 | Fate: superseed as eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
659 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
660
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
661
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
662 Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
663 ==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
665 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
666 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
667
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
668 $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
669 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
670 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
671 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
672 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
673 updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
674 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
675 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
676 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
677 @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
678 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
679 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
680 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
681 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
682 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
683 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
684 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
685 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
686 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
687
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
688 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
689 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
690 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
691 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
692 @ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
693 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
694 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
695 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
696 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
697 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
698 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
699 | x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
700 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
701 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
702 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
703 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
704 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
705 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
706 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
707 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
708 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
709 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
710 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
711 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
712 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
713 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
714
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
715 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
716 $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
717 pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
718 searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
719 adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
720 adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
721 adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
722 added 1 changesets with 0 changes to 1 files (+1 heads)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
723 2 new obsolescence markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
724 (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
725 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
726 (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
727 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
728 o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
729 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
730 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
731 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
732 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
733 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
734 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
735 | @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
736 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
737 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
738 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
739 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
740 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
741 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
742 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
743 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
744
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
745
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
746 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
747 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
748
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
749 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
750 o 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
751 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
752 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
753 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
754 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
755 | semi-colon: [7a230b46bf61]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
756 | Fate: superseed as 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
757 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
758
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
759 $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
760 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
761 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
762 @ 7a230b46bf61
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
763 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
764 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
765
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
766 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
767 @ 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
768 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
769 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
770 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
771 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
772 | semi-colon: [7a230b46bf61]
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
773 | Fate: superseed as 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
774 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
775