annotate tests/test-evolve-templates.t @ 2590:0d7dec71646d

obsfate: prepare fatelog tests Prepare obsfate venue by adding new blank output, it will helps clarify which are the new output due to obsfate or not.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 09 Jun 2017 00:31:00 +0100
parents 8412b0b7b512
children 1991935fb603
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'
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
21 > fatelog = log -G -T '{node|short}\n'
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
22 > fatelogjson = log -G -T '{node|short}\n'
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
23 > EOF
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 Test templates on amended commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
26 ================================
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 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
29 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
30
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
31 $ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
32 $ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
33 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
34 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
35 $ echo 42 >> A0
2589
8412b0b7b512 obsfate: build more advanced markers for tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2555
diff changeset
36 $ HGUSER=test1 hg amend -m "A1" --config devel.default-date="1234567890 0"
8412b0b7b512 obsfate: build more advanced markers for tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2555
diff changeset
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
38 $ hg log --hidden -G
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
39 @ changeset: 4:d004c8f274b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
40 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
41 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
42 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
43 | 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
44 | summary: A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
45 |
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
46 | x changeset: 3:a468dc9b3633
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
47 |/ parent: 0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
48 | user: test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
49 | date: Thu Jan 01 00:00:00 1970 +0000
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
50 | summary: A1
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
51 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
52 | x changeset: 2:f137d23bb3e1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
53 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
54 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
55 | | summary: temporary amend commit for 471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
56 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
57 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
61 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
65 summary: ROOT
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 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
68 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
69 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
70 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
71 working directory parent is obsolete! (471f378eab4c)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
72 (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
73
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
74 Precursors template should show current revision as it is the working copy
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
75 $ hg olog tip
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
76 o d004c8f274b9 (4) A2
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
77 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
78 x a468dc9b3633 (3) A1
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
79 | rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
80 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
81 @ 471f378eab4c (1) A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
82 rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
83
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
84 $ 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
85 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
86 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
87 | 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
88 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
89 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
90 | 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
91 | 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
92 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
93
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
94 $ hg fatelog -q
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
95 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
96 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
97 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
98 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
99 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
100
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
101 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
102 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
103 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
104 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
105 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
106 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
107
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
108 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
109 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
110 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
111 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
112 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
113 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
114
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
115 $ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
116 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
117 working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
118 (use 'hg evolve' to update to its successor: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
119
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
120 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
121 $ 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
122 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
123 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
124 | 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
125 | @ a468dc9b3633
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
126 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
127 | 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
128 | 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
129 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
130
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
131 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
132 --hidden
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
133 $ 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
134 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
135 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
136 | 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
137 | @ a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
138 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
139 | 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
140 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
141 | 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
142 | 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
143 | x f137d23bb3e1
2555
41a1d2a93223 test: fix template condition for obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2546
diff changeset
144 | | 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
145 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
146 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
147 | 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
148 | 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
149 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
150
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
151 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
152 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
153 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
154 | @ a468dc9b3633
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
155 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
156 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
157
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
158 $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
159 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
160 $ 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
161 @ d004c8f274b9
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
162 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
163 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
164
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
165 $ 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
166 @ d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
167 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
168 | 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
169 | 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
170 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
171 | 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
172 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
173 | 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
174 | 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
175 | x f137d23bb3e1
2555
41a1d2a93223 test: fix template condition for obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2546
diff changeset
176 | | 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
177 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
178 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
179 | 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
180 | 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
181 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
182
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
183 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
184 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
185 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
186 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
187
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
188
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
189 $ hg fatelog -v --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
190 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
191 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
192 | x a468dc9b3633
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
193 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
194 | x f137d23bb3e1
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
195 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
196 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
197 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
198 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
199
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
200
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
201 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
202 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
203 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
204 | x a468dc9b3633
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
205 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
206 | x f137d23bb3e1
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
207 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
208 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
209 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
210 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
211
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
212
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
213 Test templates with splitted commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
214 ===================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
215
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
216 $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
217 $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
218 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
219 $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
220 $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
221 $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
222 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
223 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
224 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
225 @ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
226 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
227 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
228 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
229 | summary: A0
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 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
232 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
233 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
234 summary: ROOT
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 $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
237 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
238 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
239 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
240 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
241 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
242 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
243 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
244 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
245 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
246 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
247 diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
248 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
249 examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
250
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
251 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
252 +42
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
253 record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
254
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
255 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
256 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
257 examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
258
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
259 created new head
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
260 Done splitting? [yN] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
261 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
262 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
263 examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
264
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
265 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
266 +43
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
267 record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
268
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
269 no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
270
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
271 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
272 @ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
273 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
274 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
275 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
276 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
277 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
278 o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
279 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
280 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
281 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
282 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
283 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
284 | x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
285 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
286 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
287 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
288 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
289 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
290 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
291 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
292 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
293
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 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
296 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
297
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
298 $ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
299 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
300 working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
301 (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
302
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
303 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
304 $ 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
305 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
306 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
307 | 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
308 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
309 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
310 | 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
311 | @ 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
312 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
313 | 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
314 | 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
315 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
316
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
317 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
318 o f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
319 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
320 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
321 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
322 | @ 471597cad322
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
323 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
324 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
325
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
326
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
327 $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
328 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
329
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
330 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
331 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
332 $ 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
333 @ f257fde29c7a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
334 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
335 o 337fec4d2edc
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
336 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
337 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
338
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
339 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
340 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
341 $ 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
342 @ f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
343 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
344 | 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
345 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
346 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
347 | 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
348 | x 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
349 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
350 | 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
351 | 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
352 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
353
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
354 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
355 @ f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
356 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
357 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
358 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
359 | x 471597cad322
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
360 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
361 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
362
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
363
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
364 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
365 @ f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
366 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
367 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
368 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
369 | x 471597cad322
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
370 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
371 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
372
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
373
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
374 Test templates with folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
375 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
376
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
377 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
378 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
379
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
380 $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
381 $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
382 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
383 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
384 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
385 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
386 @ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
387 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
388 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
389 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
390 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
391 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
392 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
393 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
394 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
395 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
396 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
397 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
398 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
399 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
400 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
401
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
402 $ 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
403 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
404 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
405 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
406 @ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
407 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
408 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
409 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
410 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
411 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
412 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
413 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
414 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
415 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
416 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
417 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
418 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
419 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
420 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
421 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
422 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
423 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
424 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
425 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
426 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
427
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
428 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
429 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
430
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
431 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
432 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
433 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
435
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
436 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
437 $ 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
438 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
439 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
440 | 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
441 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
442 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
443 | 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
444 | 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
445 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
446
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
447 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
448 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
449 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
450 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
451 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
452 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
453
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
454 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
455 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
456 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
458
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
459 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
460 displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
461 $ 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
462 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
463 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
464 | 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
465 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
466 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
467 | | 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
468 | | 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
469 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
470 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
471 | 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
472 | 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
473 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
474
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
475 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
476 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
477 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
478 | @ 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
479 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
480 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
481 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
482 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
483
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
484
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
485 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
486 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
487
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
488 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
489 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
490 $ 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
491 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
492 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
493 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
494
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
495 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
496 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
497 $ 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
498 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
499 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
500 | 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
501 | 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
502 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
503 | | 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
504 | | 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
505 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
506 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
507 | 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
508 | 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
509 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
510
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
511 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
512 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
513 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
514 | x 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
515 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
516 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
517 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
518 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
519
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
520
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
521 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
522 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
523 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
524 | x 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
525 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
526 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
527 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
528 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
529
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
530
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
531 Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
532 ==============================
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 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
535 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
536
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
537 $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
538 $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
539 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
540 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
541 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
542 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
543 @ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
544 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
545 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
546 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
547 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
548 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
549 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
550 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
551 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
552 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
553 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
554 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
555 o changeset: 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: ROOT
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 $ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
561 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
562 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
563 (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
564 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
565 2 new divergent changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
566 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
567 @ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
568 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
569 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
570 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
571 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
572 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
573 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
574 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
575 | o changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
576 |/ parent: 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 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
580 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
581 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
582 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
583 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
584 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
585 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
586 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
587 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
588 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
589 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
590 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
591
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
592 $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
593
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
594 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
595 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
596
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
597 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
598 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
599 working directory parent is obsolete! (471f378eab4c)
2546
abe6dfbdc744 evolve: fix typo: -list -> --list
Kyle Lippincott <spectral@google.com>
parents: 2502
diff changeset
600 (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
601
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602 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
603 $ 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
604 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
605 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
606 | 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
607 | 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
608 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
609 | 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
610 | @ 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: [fdf9bde5129a], [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
612 | 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
613 | 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
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
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
616 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
617 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
618 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
619 | o fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
620 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
621 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
622 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
623 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
624
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
625
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
626 $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
627 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
628 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
629 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
630 $ 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
631 o 019fadeab383
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
632 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
633 | @ fdf9bde5129a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
634 |/
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
635 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
636
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
637
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
638 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
639 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
640 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
641 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
642 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
643 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
644
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
645 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
646 $ 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
647 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
648 | Precursors: 65b757b745b9
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
649 | 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
650 | 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
651 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
652 | 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
653 | Successors: [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
654 | 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
655 | 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
656 | @ fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
657 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
658 | 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
659 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
660 |/ Successors: [fdf9bde5129a], [65b757b745b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
661 | 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
662 | 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
663 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
664
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
665 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
666 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
667 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
668 | x 65b757b745b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
669 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
670 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
671 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
672 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
673 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
674 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
675
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
676
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
677 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
678 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
679 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
680 | x 65b757b745b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
681 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
682 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
683 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
684 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
685 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
686 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
687
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
688
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
689 Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
690 ===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
691
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
692 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
693 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
694
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
695 $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
696 $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
697 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
698 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
699 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
700 $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
701 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
702 @ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
703 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
704 | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
705 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
706 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
707 | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
708 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
709 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
710 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
711 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
712 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
713 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
714 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
715 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
716 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
717 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
718 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
719 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
720 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
721 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
722 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
723
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
724 $ 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
725 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
726 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
727 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
728 @ changeset: 4:eb5a0daa2192
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: C0
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 | x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
736 | | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
737 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
738 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
739 | | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
740 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
741 | | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
742 | |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
743 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
744 | | summary: B0
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 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
747 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
748 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
749 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
750 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
751 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
752 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
753 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
754 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
755
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
756 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
757 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
758
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
759 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
760 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
761 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
762 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
763 $ 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
764 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
765 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
766 | 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
767 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
768 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
769 | 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
770 | 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
771 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
772
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
773 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
774 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
775 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
776 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
777 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
778 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
779
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
780 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
781 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
782 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
783 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
784 $ 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
785 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
786 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
787 | 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
788 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
789 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
790 | | 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
791 | | 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
792 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
793 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
794 | 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
795 | 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
796 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
797
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
798 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
799 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
800 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
801 | @ 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
802 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
803 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
804 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
805 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
806
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
807
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
808 $ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
809 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
810 working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
811 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
812 $ 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
813 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
814 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
815 | 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
816 | @ b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
817 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
818 | | 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
819 | | 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
820 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
821 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
822 | 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
823 | 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
824 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
825
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
826 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
827 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
828 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
829 | @ b7ea6d14e664
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
830 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
831 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
832 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
833 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
834
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
835
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
836 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
837 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
838 $ 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
839 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
840 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
841 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
842
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
843 $ 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
844 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
845 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
846 | 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
847 | 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
848 | | Precursors: 0dec01379d3b
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
849 | | 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
850 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
851 | | 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
852 | | 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
853 | | x 0dec01379d3b
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
854 | |/ Successors: [b7ea6d14e664]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
855 | | 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
856 | | 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
857 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
858 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
859 | 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
860 | 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
861 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
862
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
863 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
864 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
865 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
866 | x b7ea6d14e664
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
867 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
868 | | x 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
869 | |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
870 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
871 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
872 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
873
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
874 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
875 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
876 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
877 | x b7ea6d14e664
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
878 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
879 | | x 0dec01379d3b
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
880 | |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
881 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
882 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
883 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
884
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
885
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
886 Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
887 ==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
888
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
889 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
890 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
891
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
892 $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
893 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
894 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
895 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
896 $ 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
897 updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
898 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
899 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
900 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
901 @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
902 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
903 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
904 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
905 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
906 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
907 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
908 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
909 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
910 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
911
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
912 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
913 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
914 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
915 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
916 @ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
917 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
918 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
919 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
920 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
921 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
922 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
923 | x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
924 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
925 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
926 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
927 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
928 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
929 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
930 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
931 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
932 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
933 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
934 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
935 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
936 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
937 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
938
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
939 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
940 $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
941 pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
942 searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
943 adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
944 adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
945 adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
946 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
947 2 new obsolescence markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
948 (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
949 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
950 (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
951 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
952 o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
953 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
954 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
955 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
956 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
957 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
958 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
959 | @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
960 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
961 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
962 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
963 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
964 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
965 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
966 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
967 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
968
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
969
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
970 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
971 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
972
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
973 $ 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
974 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
975 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
976 | 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
977 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
978 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
979 | 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
980 | 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
981 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
982
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
983 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
984 o 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
985 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
986 | @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
987 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
988 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
989
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
990 $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
991 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
992 $ 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
993 @ 7a230b46bf61
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
994 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
995 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
996
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
997 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
998 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
999 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1000 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1001
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1002 $ 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
1003 @ 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1004 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
1005 | 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
1006 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
1007 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
1008 | 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
1009 | 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
1010 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
1011
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1012 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1013 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1014 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1015 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1016 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1017 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1018
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1019
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1020 $ hg fatelogjson --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1021 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1022 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1023 | x 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1024 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1025 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1026
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1027
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1028 Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1029 ==================================
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1030
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1031 Test setup
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1032 ----------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1033
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1034 $ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1035 $ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1036 $ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1037 $ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1038 $ hg prune .
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1039 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1040 working directory now at ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1041 1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1042
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1043 Check output
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1044 ------------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1045
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1046 $ hg up "desc(A0)" --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1047 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1048 working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1049 (use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1050 $ hg tlog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1051 @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1052 | Fate: pruned
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1053 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1054
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1055 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1056 @ 471f378eab4c
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1057 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1058 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1059