Mercurial > hg > evolve

annotate tests/test-evolve-templates.t @ 3025:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 462adae9fea7
children bd7e8be29542
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2582
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]
2593
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2592
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: 2592
diff changeset
16 > {if(precursors, "\n Precursors: {precursors}")}\
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
2594
b765650b37ee template: skip "successors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2593
diff changeset
18 > {if(successors, "\n Successors: {successors}")}\
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
2725
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2709
diff changeset
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n'
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2709
diff changeset
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}'
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
2582
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
2685
8412b0b7b512 obsfate: build more advanced markers for tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2651
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: 2651
diff changeset
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
38 $ hg log --hidden -G
3025
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2992
diff changeset
39 @ changeset: 3:d004c8f274b9
2582
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
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
44 | summary: A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
45 |
3025
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2992
diff changeset
46 | x changeset: 2:a468dc9b3633
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
47 |/ parent: 0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
48 | user: test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
49 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
50 | obsolete: reworded by test2 as d004c8f274b9
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
51 | summary: A1
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
52 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
53 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
54 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
55 | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
56 | obsolete: rewritten by test1 as a468dc9b3633
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
57 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
61 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
65 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
66 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
67 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
68 working directory parent is obsolete! (471f378eab4c)
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
69 (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
70
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
71 Precursors template should show current revision as it is the working copy
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
72 $ hg olog tip
3025
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2992
diff changeset
73 o d004c8f274b9 (3) A2
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
74 |
3025
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2992
diff changeset
75 x a468dc9b3633 (2) A1
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
76 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
77 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
78 @ 471f378eab4c (1) A0
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
79 rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000)
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
80
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
81 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
82 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
83 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
84 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
85 | @ 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
86 |/ Successors: [d004c8f274b9]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
87 | semi-colon: [d004c8f274b9]
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
88 | Fate: rewritten as d004c8f274b9 by test1, test2
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
89 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
90 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
91
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
92 $ hg fatelog -q
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
93 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
94 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
95 | @ 471f378eab4c
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
96 |/ Obsfate: rewritten as d004c8f274b9
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
97 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
98 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
99
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
100
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
101 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
102 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
103 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
104 | @ 471f378eab4c
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
105 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
106 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
107 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
108
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
109 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
110 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
111 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
112 | @ 471f378eab4c
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
113 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
114 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
115 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
116
2695
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
117
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
118 (check json)
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
119
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
120 $ hg log -GT '{precursors|json}\n'
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
121 o ["471f378eab4c5e25f6c77f785b27c936efb22874"]
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
122 |
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
123 | @ []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
124 |/
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
125 o []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
126
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2687
diff changeset
127
2698
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
128 $ hg log -GT '{successors|json}\n'
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
129 o ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
130 |
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
131 | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
132 |/
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
133 o ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
134
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2695
diff changeset
135
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
136 $ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
138 working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
139 (use 'hg evolve' to update to its successor: d004c8f274b9)
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
140
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
141 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
142 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
143 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
144 | Precursors: a468dc9b3633
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
145 | semi-colon: a468dc9b3633
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
146 | @ a468dc9b3633
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
147 |/ Successors: [d004c8f274b9]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
148 | semi-colon: [d004c8f274b9]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
149 | Fate: reworded as d004c8f274b9 by test2
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
150 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
151 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
152
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
153 Precursors template should show the precursor as we force its display with
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
154 --hidden
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
155 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
156 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
157 | Precursors: a468dc9b3633
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
158 | semi-colon: a468dc9b3633
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
159 | @ a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
160 |/ Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
161 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
162 | Successors: [d004c8f274b9]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
163 | semi-colon: [d004c8f274b9]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
164 | Fate: reworded as d004c8f274b9 by test2
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
165 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
166 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
167 |/ Successors: [a468dc9b3633]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
168 | semi-colon: [a468dc9b3633]
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
169 | Fate: rewritten as a468dc9b3633 by test1
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
170 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
171 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
172
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
173 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
174 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
175 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
176 | @ a468dc9b3633
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
177 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
178 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
179 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
180
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
181 $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
182 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
183 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
184 @ d004c8f274b9
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
185 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
186 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
187
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
188 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
189 @ d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
190 | Precursors: a468dc9b3633
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
191 | semi-colon: a468dc9b3633
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
192 | x a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
193 |/ Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
194 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
195 | Successors: [d004c8f274b9]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
196 | semi-colon: [d004c8f274b9]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
197 | Fate: reworded as d004c8f274b9 by test2
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
198 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
199 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
200 |/ Successors: [a468dc9b3633]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
201 | semi-colon: [a468dc9b3633]
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
202 | Fate: rewritten as a468dc9b3633 by test1
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
203 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
204 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
205
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
206 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
207 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
208 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
209 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
210
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
211
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
212 $ hg fatelog -v --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
213 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
214 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
215 | x a468dc9b3633
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
216 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
217 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
218 | x 471f378eab4c
2928
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2806
diff changeset
219 |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
220 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
221 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
222
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
223
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
224 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
225 @ d004c8f274b9 ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
226 |
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
227 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
228 |/
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
229 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
230 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
231 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
232
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
233
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
234 Test templates with splitted commit
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
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
237 $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
238 $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
239 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
240 $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
241 $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
242 $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
243 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
244 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
245 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
246 @ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
247 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
248 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
249 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
250 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
251 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
252 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
253 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
254 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
255 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
256
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
257 $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
258 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
259 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
260 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
261 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
262 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
263 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
264 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
265 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
266 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
267 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
268 diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
269 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
270 examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
271
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
272 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
273 +42
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
274 record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
275
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
276 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
277 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
278 examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
279
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
280 created new head
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
281 Done splitting? [yN] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
282 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
283 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
284 examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
285
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
286 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
287 +43
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
288 record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
289
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
290 no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
291
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
292 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
293 @ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
294 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
295 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
296 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
297 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
298 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
299 o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
300 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
301 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
302 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
303 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
304 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
305 | x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
306 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
307 | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
308 | obsolete: split as 337fec4d2edc, f257fde29c7a
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
309 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
310 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
311 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
312 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
313 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
314 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
315
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
316
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
317 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
318 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
319
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
320 $ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
321 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
322 working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
323 (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
324
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
325 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
326 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
327 o f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
328 | Precursors: 471597cad322
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
329 | semi-colon: 471597cad322
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
330 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
331 | Precursors: 471597cad322
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
332 | semi-colon: 471597cad322
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
333 | @ 471597cad322
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
334 |/ Successors: [337fec4d2edc, f257fde29c7a]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
335 | semi-colon: [337fec4d2edc, f257fde29c7a]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
336 | Fate: split as 337fec4d2edc, f257fde29c7a
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
337 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
338 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
339
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
340 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
341 o f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
342 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
343 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
344 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
345 | @ 471597cad322
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
346 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
347 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
348 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
349
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
350
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
351 $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
352 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
353
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
354 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
355 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
356 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
357 @ f257fde29c7a
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
358 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
359 o 337fec4d2edc
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
360 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
361 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
362
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
363 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
364 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
365 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
366 @ f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
367 | Precursors: 471597cad322
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
368 | semi-colon: 471597cad322
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
369 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
370 | Precursors: 471597cad322
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
371 | semi-colon: 471597cad322
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
372 | x 471597cad322
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
373 |/ Successors: [337fec4d2edc, f257fde29c7a]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
374 | semi-colon: [337fec4d2edc, f257fde29c7a]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
375 | Fate: split as 337fec4d2edc, f257fde29c7a
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
376 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
377 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
378
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
379 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
380 @ f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
381 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
382 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
383 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
384 | x 471597cad322
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
385 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
386 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
387 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
388
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
389
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
390 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
391 @ f257fde29c7a ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
392 |
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
393 o 337fec4d2edc ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
394 |
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
395 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
396 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
397 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
398
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
399
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
400 Test templates with folded commit
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
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
403 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
404 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
405
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
406 $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
407 $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
408 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
409 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
410 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
411 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
412 @ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
413 | tag: tip
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 o 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 $ 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
429 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
430 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
431 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
432 @ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
433 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
435 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
436 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
437 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
438 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
439 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
440 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
441 | | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
442 | | obsolete: rewritten as eb5a0daa2192
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
443 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
444 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
445 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
446 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
447 | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
448 | obsolete: rewritten as eb5a0daa2192
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
449 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
450 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
451 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
452 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
453 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
454 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
455
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
456 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 ---------------
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 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
460 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
461 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
462 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
463
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
464 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
465 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
466 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
467 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
468 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
469 | @ 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
470 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
471 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
472 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
473 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
474 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
475
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
476 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
477 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
478 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
479 | @ 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
480 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
481 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
482 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
483
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
484 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
485 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
486 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
487 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
488
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
489 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
490 displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
491 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
492 o eb5a0daa2192
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
493 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
494 | semi-colon: 0dec01379d3b; 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
495 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
496 | | Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
497 | | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
498 | | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
499 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
500 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
501 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
502 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
503 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
504 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
505 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
506
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
507 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
508 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
509 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
510 | @ 0dec01379d3b
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
511 | | Obsfate: rewritten as eb5a0daa2192
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
512 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
513 | x 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
514 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
515 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
516 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
517
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
518
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
519 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
520 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
521
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
522 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
523 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
524 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
525 @ eb5a0daa2192
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
526 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
527 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
528
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
529 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
530 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
531 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
532 @ eb5a0daa2192
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
533 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
534 | semi-colon: 0dec01379d3b; 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
535 | x 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
536 | | Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
537 | | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
538 | | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
539 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
540 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
541 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
542 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
543 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
544 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
545 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
546
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
547 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
548 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
549 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
550 | x 0dec01379d3b
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
551 | | Obsfate: rewritten as eb5a0daa2192
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
552 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
553 | x 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
554 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
555 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
556 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
557
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
558
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
559 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
560 @ eb5a0daa2192 ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
561 |
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
562 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
563 | |
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
564 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
565 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
566 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
567
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
568
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
569 Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
570 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
571
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
572 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
573 ----------
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 $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
576 $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
577 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
578 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
579 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
580 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
581 @ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
582 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
583 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
584 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
585 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
586 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
587 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
588 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
589 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
590 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
591 | obsolete: reworded as fdf9bde5129a
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
592 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
593 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
594 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
595 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
596 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
597 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
598
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
599 $ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
600 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
601 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602 (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
603 $ hg amend -m "A2"
2954
4b934144ed11 messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 2952
diff changeset
604 2 new content-divergent changesets
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
605 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
606 @ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
607 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
608 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
609 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
610 | date: Thu Jan 01 00:00:00 1970 +0000
2931
20c2499ce8bc log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents: 2929
diff changeset
611 | instability: content-divergent
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
612 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
613 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
614 | o changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
615 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
616 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
617 | date: Thu Jan 01 00:00:00 1970 +0000
2931
20c2499ce8bc log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents: 2929
diff changeset
618 | instability: content-divergent
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
619 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
620 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
621 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
622 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
623 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
624 | obsolete: reworded as fdf9bde5129a
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
625 | obsolete: reworded as 65b757b745b9
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
626 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
627 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
628 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
629 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
630 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
631 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
632
2583
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
633 $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2582
diff changeset
634
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
635 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
636 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
637
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
638 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
639 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
640 working directory parent is obsolete! (471f378eab4c)
2931
20c2499ce8bc log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents: 2929
diff changeset
641 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
642
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
643 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
644 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
645 o 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
646 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
647 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
648 | o fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
649 |/ Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
650 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
651 | @ 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
652 |/ Successors: [fdf9bde5129a], [019fadeab383]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
653 | semi-colon: [fdf9bde5129a]; [019fadeab383]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
654 | Fate: reworded as fdf9bde5129a
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
655 | Fate: reworded as 019fadeab383
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
656 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
657 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
658
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
659 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
660 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
661 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
662 | o fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
663 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
664 | @ 471f378eab4c
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
665 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
666 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
667 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
668
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
669
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
670 $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
671 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
672 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
673 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
674 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
675 o 019fadeab383
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
676 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
677 | @ fdf9bde5129a
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
678 |/
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
679 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
680
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
681
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
682 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
683 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
684 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
685 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
686 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
687 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
688
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
689 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
690 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
691 o 019fadeab383
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
692 | Precursors: 65b757b745b9
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
693 | semi-colon: 65b757b745b9
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
694 | x 65b757b745b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
695 |/ Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
696 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
697 | Successors: [019fadeab383]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
698 | semi-colon: [019fadeab383]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
699 | Fate: reworded as 019fadeab383
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
700 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
701 | @ fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
702 |/ Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
703 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
704 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
705 |/ Successors: [fdf9bde5129a], [65b757b745b9]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
706 | semi-colon: [fdf9bde5129a]; [65b757b745b9]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
707 | Fate: reworded as fdf9bde5129a
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
708 | Fate: reworded as 65b757b745b9
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
709 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
710 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
711
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
712 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
713 o 019fadeab383
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
714 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
715 | x 65b757b745b9
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
716 |/ Obsfate: reworded as 019fadeab383
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
717 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
718 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
719 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
720 | x 471f378eab4c
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
721 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
722 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
723 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
724
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
725
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
726 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
727 o 019fadeab383 ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
728 |
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
729 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
730 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
731 | @ fdf9bde5129a ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
732 |/
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
733 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
734 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
735 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
736
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
737
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
738 Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
739 ===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
740
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
741 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
742 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
743
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
744 $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
745 $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
746 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
747 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
748 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
749 $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
750 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
751 @ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
752 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
753 | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
754 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
755 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
756 | summary: B1
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 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
759 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
760 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
761 | obsolete: reworded as b7ea6d14e664
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
762 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
763 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
764 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
765 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
766 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
767 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
768 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
769 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
770 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
771 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
772 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
773
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
774 $ 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
775 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
776 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
777 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
778 @ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
779 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
780 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
781 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
782 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
783 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
784 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
785 | x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
786 | | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
787 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
788 | | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
789 | | obsolete: rewritten as eb5a0daa2192
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
790 | | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
791 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
792 | | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
793 | |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
794 | | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
795 | | obsolete: reworded as b7ea6d14e664
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
796 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
797 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
798 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
799 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
800 | date: Thu Jan 01 00:00:00 1970 +0000
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
801 | obsolete: rewritten as eb5a0daa2192
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
802 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
803 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
804 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
805 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
806 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
807 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
808
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
809 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
810 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
811
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
812 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
813 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
814 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
815 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
816 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
817 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
818 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
819 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
820 | @ 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
821 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
822 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
823 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
824 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
825 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
826
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
827 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
828 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
829 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
830 | @ 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
831 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
832 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
833 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
834
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
835 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
836 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
837 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
838 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
839 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
840 o eb5a0daa2192
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
841 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
842 | semi-colon: 0dec01379d3b; 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
843 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
844 | | Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
845 | | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
846 | | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
847 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
848 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
849 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
850 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
851 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
852 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
853 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
854
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
855 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
856 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
857 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
858 | @ 0dec01379d3b
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
859 | | Obsfate: rewritten as eb5a0daa2192
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
860 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
861 | x 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
862 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
863 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
864 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
865
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
866
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
867 $ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
868 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
869 working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
870 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
871 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
872 o eb5a0daa2192
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
873 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
874 | semi-colon: 471f378eab4c; b7ea6d14e664
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
875 | @ b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
876 | | Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
877 | | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
878 | | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
879 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
880 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
881 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
882 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
883 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
884 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
885 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
886
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
887 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
888 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
889 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
890 | @ b7ea6d14e664
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
891 | | Obsfate: rewritten as eb5a0daa2192
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
892 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
893 | x 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
894 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
895 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
896 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
897
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
898
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
899 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
900 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
901 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
902 @ eb5a0daa2192
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
903 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
904 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
905
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
906 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
907 @ eb5a0daa2192
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
908 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
909 | semi-colon: 471f378eab4c; b7ea6d14e664
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
910 | x b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
911 | | Precursors: 0dec01379d3b
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
912 | | semi-colon: 0dec01379d3b
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
913 | | Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
914 | | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
915 | | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
916 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
917 | | x 0dec01379d3b
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
918 | |/ Successors: [b7ea6d14e664]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
919 | | semi-colon: [b7ea6d14e664]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
920 | | Fate: reworded as b7ea6d14e664
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
921 | |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
922 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
923 |/ Successors: [eb5a0daa2192]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
924 | semi-colon: [eb5a0daa2192]
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
925 | Fate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
926 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
927 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
928
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
929 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
930 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
931 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
932 | x b7ea6d14e664
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
933 | | Obsfate: rewritten as eb5a0daa2192
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
934 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
935 | | x 0dec01379d3b
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
936 | |/ Obsfate: reworded as b7ea6d14e664
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
937 | |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
938 | x 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
939 |/ Obsfate: rewritten as eb5a0daa2192
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
940 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
941 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
942
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
943 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
944 @ eb5a0daa2192 ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
945 |
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
946 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
947 | |
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
948 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
949 | |/
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
950 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
951 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
952 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
953
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
954
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
955 Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
956 ==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
957
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
958 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
959 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
960
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
961 $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
962 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
963 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
964 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
965 $ 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
966 updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
967 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
968 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
969 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
970 @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
971 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
972 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
973 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
974 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
975 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
976 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
977 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
978 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
979 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
980
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
981 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
982 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
983 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
984 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
985 @ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
986 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
987 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
988 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
989 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
990 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
991 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
992 | x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
993 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
994 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
995 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
996 | obsolete: reworded as 7a230b46bf61
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
997 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
998 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
999 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1000 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1001 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1002 | obsolete: reworded as fdf9bde5129a
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1003 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1004 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1005 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1006 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1007 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1008 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1009
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1010 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1011 $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1012 pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1013 searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1014 adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1015 adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1016 adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1017 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
1018 2 new obsolescence markers
2806
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2805
diff changeset
1019 obsoleted 1 changesets
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1020 (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1021 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1022 (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1023 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1024 o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1025 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1026 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1027 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1028 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1029 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1030 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1031 | @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1032 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1033 | date: Thu Jan 01 00:00:00 1970 +0000
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1034 | obsolete: reworded as 7a230b46bf61
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1035 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1036 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1037 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1038 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1039 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1040 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1041
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1042 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1043 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1044
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1045 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1046 o 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1047 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
1048 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1049 | @ 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
1050 |/ Successors: [7a230b46bf61]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
1051 | semi-colon: [7a230b46bf61]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1052 | Fate: reworded as 7a230b46bf61
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1053 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1054 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
1055
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1056 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1057 o 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1058 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1059 | @ 471f378eab4c
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1060 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1061 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1062 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1063
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1064 $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1065 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
1066 $ hg tlog
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1067 @ 7a230b46bf61
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
1068 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1069 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
1070
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1071 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1072 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1073 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1074 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1075
2582
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1076 $ hg tlog --hidden
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1077 @ 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1078 | Precursors: 471f378eab4c
2596
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2595
diff changeset
1079 | semi-colon: 471f378eab4c
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1080 | x 471f378eab4c
2592
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
1081 |/ Successors: [7a230b46bf61]
2598
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2596
diff changeset
1082 | semi-colon: [7a230b46bf61]
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1083 | Fate: reworded as 7a230b46bf61
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1084 |
2591
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2590
diff changeset
1085 o ea207398892e
2595
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2594
diff changeset
1086
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1087 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1088 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1089 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1090 | x 471f378eab4c
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1091 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1092 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1093 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1094
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1095
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1096 $ hg fatelogjson --hidden
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1097 @ 7a230b46bf61 ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1098 |
2992
462adae9fea7 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents: 2954
diff changeset
1099 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1100 |/
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1101 o ea207398892e ""
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1102
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1103
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1104 Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1105 ==================================
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1106
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1107 Test setup
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1108 ----------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1109
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1110 $ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1111 $ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1112 $ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1113 $ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1114 $ hg prune .
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1115 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: 2685
diff changeset
1116 working directory now at ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1117 1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1118
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1119 Check output
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1120 ------------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1121
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1122 $ hg up "desc(A0)" --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1123 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: 2685
diff changeset
1124 working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1125 (use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1126 $ hg tlog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1127 @ 471f378eab4c
2708
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
1128 | Fate: pruned
2687
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2686
diff changeset
1129 |
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1130 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1131
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1132 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1133 @ 471f378eab4c
2805
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2794
diff changeset
1134 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
2686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1135 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1136 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2685
diff changeset
1137