##// END OF EJS Templates
test: add more obsmarker tests for pruning scenarios...
Boris Feld -
r33999:d0f1e3d3 default
parent child Browse files
Show More
@@ -1,1645 +1,1780 b''
1 This test file test the various templates related to obsmarkers.
1 This test file test the various templates related to obsmarkers.
2
2
3 Global setup
3 Global setup
4 ============
4 ============
5
5
6 $ . $TESTDIR/testlib/obsmarker-common.sh
6 $ . $TESTDIR/testlib/obsmarker-common.sh
7 $ cat >> $HGRCPATH <<EOF
7 $ cat >> $HGRCPATH <<EOF
8 > [ui]
8 > [ui]
9 > interactive = true
9 > interactive = true
10 > [phases]
10 > [phases]
11 > publish=False
11 > publish=False
12 > [experimental]
12 > [experimental]
13 > stabilization=all
13 > stabilization=all
14 > [templates]
14 > [templates]
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
16 > obsfateverb = "{obsfateverb(successors)}"
16 > obsfateverb = "{obsfateverb(successors)}"
17 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
17 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
18 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
18 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
19 > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
19 > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
20 > [alias]
20 > [alias]
21 > tlog = log -G -T '{node|short}\
21 > tlog = log -G -T '{node|short}\
22 > {if(predecessors, "\n Predecessors: {predecessors}")}\
22 > {if(predecessors, "\n Predecessors: {predecessors}")}\
23 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
23 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
24 > {if(predecessors, "\n json: {predecessors|json}")}\
24 > {if(predecessors, "\n json: {predecessors|json}")}\
25 > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
25 > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
26 > {if(successorssets, "\n Successors: {successorssets}")}\
26 > {if(successorssets, "\n Successors: {successorssets}")}\
27 > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\
27 > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\
28 > {if(successorssets, "\n json: {successorssets|json}")}\n'
28 > {if(successorssets, "\n json: {successorssets|json}")}\n'
29 > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfate}"} \n" )}'
29 > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfate}"} \n" )}'
30 > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}'
30 > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}'
31 > EOF
31 > EOF
32
32
33 Test templates on amended commit
33 Test templates on amended commit
34 ================================
34 ================================
35
35
36 Test setup
36 Test setup
37 ----------
37 ----------
38
38
39 $ hg init $TESTTMP/templates-local-amend
39 $ hg init $TESTTMP/templates-local-amend
40 $ cd $TESTTMP/templates-local-amend
40 $ cd $TESTTMP/templates-local-amend
41 $ mkcommit ROOT
41 $ mkcommit ROOT
42 $ mkcommit A0
42 $ mkcommit A0
43 $ echo 42 >> A0
43 $ echo 42 >> A0
44 $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
44 $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
45 $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0"
45 $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0"
46
46
47 $ hg log --hidden -G
47 $ hg log --hidden -G
48 @ changeset: 4:d004c8f274b9
48 @ changeset: 4:d004c8f274b9
49 | tag: tip
49 | tag: tip
50 | parent: 0:ea207398892e
50 | parent: 0:ea207398892e
51 | user: test
51 | user: test
52 | date: Thu Jan 01 00:00:00 1970 +0000
52 | date: Thu Jan 01 00:00:00 1970 +0000
53 | summary: A2
53 | summary: A2
54 |
54 |
55 | x changeset: 3:a468dc9b3633
55 | x changeset: 3:a468dc9b3633
56 |/ parent: 0:ea207398892e
56 |/ parent: 0:ea207398892e
57 | user: test
57 | user: test
58 | date: Thu Jan 01 00:00:00 1970 +0000
58 | date: Thu Jan 01 00:00:00 1970 +0000
59 | summary: A1
59 | summary: A1
60 |
60 |
61 | x changeset: 2:f137d23bb3e1
61 | x changeset: 2:f137d23bb3e1
62 | | user: test
62 | | user: test
63 | | date: Thu Jan 01 00:00:00 1970 +0000
63 | | date: Thu Jan 01 00:00:00 1970 +0000
64 | | summary: temporary amend commit for 471f378eab4c
64 | | summary: temporary amend commit for 471f378eab4c
65 | |
65 | |
66 | x changeset: 1:471f378eab4c
66 | x changeset: 1:471f378eab4c
67 |/ user: test
67 |/ user: test
68 | date: Thu Jan 01 00:00:00 1970 +0000
68 | date: Thu Jan 01 00:00:00 1970 +0000
69 | summary: A0
69 | summary: A0
70 |
70 |
71 o changeset: 0:ea207398892e
71 o changeset: 0:ea207398892e
72 user: test
72 user: test
73 date: Thu Jan 01 00:00:00 1970 +0000
73 date: Thu Jan 01 00:00:00 1970 +0000
74 summary: ROOT
74 summary: ROOT
75
75
76 Check templates
76 Check templates
77 ---------------
77 ---------------
78 $ hg up 'desc(A0)' --hidden
78 $ hg up 'desc(A0)' --hidden
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80
80
81 Predecessors template should show current revision as it is the working copy
81 Predecessors template should show current revision as it is the working copy
82 $ hg tlog
82 $ hg tlog
83 o d004c8f274b9
83 o d004c8f274b9
84 | Predecessors: 1:471f378eab4c
84 | Predecessors: 1:471f378eab4c
85 | semi-colon: 1:471f378eab4c
85 | semi-colon: 1:471f378eab4c
86 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
86 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
87 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
87 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
88 | @ 471f378eab4c
88 | @ 471f378eab4c
89 |/ Successors: 4:d004c8f274b9
89 |/ Successors: 4:d004c8f274b9
90 | multi-line: 4:d004c8f274b9
90 | multi-line: 4:d004c8f274b9
91 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
91 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
92 o ea207398892e
92 o ea207398892e
93
93
94 $ hg fatelog -q --traceback
94 $ hg fatelog -q --traceback
95 o d004c8f274b9
95 o d004c8f274b9
96 |
96 |
97 | @ 471f378eab4c
97 | @ 471f378eab4c
98 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
98 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
99 o ea207398892e
99 o ea207398892e
100
100
101 $ hg fatelog
101 $ hg fatelog
102 o d004c8f274b9
102 o d004c8f274b9
103 |
103 |
104 | @ 471f378eab4c
104 | @ 471f378eab4c
105 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
105 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
106 o ea207398892e
106 o ea207398892e
107
107
108 $ hg fatelog -v
108 $ hg fatelog -v
109 o d004c8f274b9
109 o d004c8f274b9
110 |
110 |
111 | @ 471f378eab4c
111 | @ 471f378eab4c
112 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
112 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
113 o ea207398892e
113 o ea207398892e
114
114
115 $ hg up 'desc(A1)' --hidden
115 $ hg up 'desc(A1)' --hidden
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
117
117
118 Predecessors template should show current revision as it is the working copy
118 Predecessors template should show current revision as it is the working copy
119 $ hg tlog
119 $ hg tlog
120 o d004c8f274b9
120 o d004c8f274b9
121 | Predecessors: 3:a468dc9b3633
121 | Predecessors: 3:a468dc9b3633
122 | semi-colon: 3:a468dc9b3633
122 | semi-colon: 3:a468dc9b3633
123 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
123 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
124 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
124 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
125 | @ a468dc9b3633
125 | @ a468dc9b3633
126 |/ Successors: 4:d004c8f274b9
126 |/ Successors: 4:d004c8f274b9
127 | multi-line: 4:d004c8f274b9
127 | multi-line: 4:d004c8f274b9
128 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
128 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
129 o ea207398892e
129 o ea207398892e
130
130
131 $ hg fatelog -v
131 $ hg fatelog -v
132 o d004c8f274b9
132 o d004c8f274b9
133 |
133 |
134 | @ a468dc9b3633
134 | @ a468dc9b3633
135 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
135 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
136 o ea207398892e
136 o ea207398892e
137
137
138 Predecessors template should show all the predecessors as we force their display
138 Predecessors template should show all the predecessors as we force their display
139 with --hidden
139 with --hidden
140 $ hg tlog --hidden
140 $ hg tlog --hidden
141 o d004c8f274b9
141 o d004c8f274b9
142 | Predecessors: 3:a468dc9b3633
142 | Predecessors: 3:a468dc9b3633
143 | semi-colon: 3:a468dc9b3633
143 | semi-colon: 3:a468dc9b3633
144 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
144 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
145 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
145 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
146 | @ a468dc9b3633
146 | @ a468dc9b3633
147 |/ Predecessors: 1:471f378eab4c
147 |/ Predecessors: 1:471f378eab4c
148 | semi-colon: 1:471f378eab4c
148 | semi-colon: 1:471f378eab4c
149 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
149 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
150 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
150 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
151 | Successors: 4:d004c8f274b9
151 | Successors: 4:d004c8f274b9
152 | multi-line: 4:d004c8f274b9
152 | multi-line: 4:d004c8f274b9
153 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
153 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
154 | x f137d23bb3e1
154 | x f137d23bb3e1
155 | |
155 | |
156 | x 471f378eab4c
156 | x 471f378eab4c
157 |/ Successors: 3:a468dc9b3633
157 |/ Successors: 3:a468dc9b3633
158 | multi-line: 3:a468dc9b3633
158 | multi-line: 3:a468dc9b3633
159 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
159 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
160 o ea207398892e
160 o ea207398892e
161
161
162 $ hg fatelog --hidden -q
162 $ hg fatelog --hidden -q
163 o d004c8f274b9
163 o d004c8f274b9
164 |
164 |
165 | @ a468dc9b3633
165 | @ a468dc9b3633
166 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
166 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
167 | x f137d23bb3e1
167 | x f137d23bb3e1
168 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000);
168 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000);
169 | x 471f378eab4c
169 | x 471f378eab4c
170 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
170 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
171 o ea207398892e
171 o ea207398892e
172
172
173
173
174 Predecessors template shouldn't show anything as all obsolete commit are not
174 Predecessors template shouldn't show anything as all obsolete commit are not
175 visible.
175 visible.
176 $ hg up 'desc(A2)'
176 $ hg up 'desc(A2)'
177 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
177 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
178 $ hg tlog
178 $ hg tlog
179 @ d004c8f274b9
179 @ d004c8f274b9
180 |
180 |
181 o ea207398892e
181 o ea207398892e
182
182
183 $ hg tlog --hidden
183 $ hg tlog --hidden
184 @ d004c8f274b9
184 @ d004c8f274b9
185 | Predecessors: 3:a468dc9b3633
185 | Predecessors: 3:a468dc9b3633
186 | semi-colon: 3:a468dc9b3633
186 | semi-colon: 3:a468dc9b3633
187 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
187 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
188 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
188 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
189 | x a468dc9b3633
189 | x a468dc9b3633
190 |/ Predecessors: 1:471f378eab4c
190 |/ Predecessors: 1:471f378eab4c
191 | semi-colon: 1:471f378eab4c
191 | semi-colon: 1:471f378eab4c
192 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
192 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
193 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
193 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
194 | Successors: 4:d004c8f274b9
194 | Successors: 4:d004c8f274b9
195 | multi-line: 4:d004c8f274b9
195 | multi-line: 4:d004c8f274b9
196 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
196 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
197 | x f137d23bb3e1
197 | x f137d23bb3e1
198 | |
198 | |
199 | x 471f378eab4c
199 | x 471f378eab4c
200 |/ Successors: 3:a468dc9b3633
200 |/ Successors: 3:a468dc9b3633
201 | multi-line: 3:a468dc9b3633
201 | multi-line: 3:a468dc9b3633
202 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
202 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
203 o ea207398892e
203 o ea207398892e
204
204
205 $ hg fatelog -v
205 $ hg fatelog -v
206 @ d004c8f274b9
206 @ d004c8f274b9
207 |
207 |
208 o ea207398892e
208 o ea207398892e
209
209
210
210
211 $ hg fatelog -v --hidden
211 $ hg fatelog -v --hidden
212 @ d004c8f274b9
212 @ d004c8f274b9
213 |
213 |
214 | x a468dc9b3633
214 | x a468dc9b3633
215 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
215 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
216 | x f137d23bb3e1
216 | x f137d23bb3e1
217 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000);
217 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000);
218 | x 471f378eab4c
218 | x 471f378eab4c
219 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
219 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
220 o ea207398892e
220 o ea207398892e
221
221
222 $ hg fatelogjson --hidden
222 $ hg fatelogjson --hidden
223 @ d004c8f274b9
223 @ d004c8f274b9
224 |
224 |
225 | x a468dc9b3633
225 | x a468dc9b3633
226 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
226 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
227 | x f137d23bb3e1
227 | x f137d23bb3e1
228 | | Obsfate: [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "successors": []}]
228 | | Obsfate: [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "successors": []}]
229 | x 471f378eab4c
229 | x 471f378eab4c
230 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
230 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
231 o ea207398892e
231 o ea207398892e
232
232
233 Test templates with splitted commit
233 Test templates with splitted commit
234 ===================================
234 ===================================
235
235
236 $ hg init $TESTTMP/templates-local-split
236 $ hg init $TESTTMP/templates-local-split
237 $ cd $TESTTMP/templates-local-split
237 $ cd $TESTTMP/templates-local-split
238 $ mkcommit ROOT
238 $ mkcommit ROOT
239 $ echo 42 >> a
239 $ echo 42 >> a
240 $ echo 43 >> b
240 $ echo 43 >> b
241 $ hg commit -A -m "A0"
241 $ hg commit -A -m "A0"
242 adding a
242 adding a
243 adding b
243 adding b
244 $ hg log --hidden -G
244 $ hg log --hidden -G
245 @ changeset: 1:471597cad322
245 @ changeset: 1:471597cad322
246 | tag: tip
246 | tag: tip
247 | user: test
247 | user: test
248 | date: Thu Jan 01 00:00:00 1970 +0000
248 | date: Thu Jan 01 00:00:00 1970 +0000
249 | summary: A0
249 | summary: A0
250 |
250 |
251 o changeset: 0:ea207398892e
251 o changeset: 0:ea207398892e
252 user: test
252 user: test
253 date: Thu Jan 01 00:00:00 1970 +0000
253 date: Thu Jan 01 00:00:00 1970 +0000
254 summary: ROOT
254 summary: ROOT
255
255
256 # Simulate split
256 # Simulate split
257 $ hg up -r "desc(ROOT)"
257 $ hg up -r "desc(ROOT)"
258 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
258 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
259 $ echo 42 >> a
259 $ echo 42 >> a
260 $ hg commit -A -m "A0"
260 $ hg commit -A -m "A0"
261 adding a
261 adding a
262 created new head
262 created new head
263 $ echo 43 >> b
263 $ echo 43 >> b
264 $ hg commit -A -m "A0"
264 $ hg commit -A -m "A0"
265 adding b
265 adding b
266 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
266 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
267 obsoleted 1 changesets
267 obsoleted 1 changesets
268
268
269 $ hg log --hidden -G
269 $ hg log --hidden -G
270 @ changeset: 3:f257fde29c7a
270 @ changeset: 3:f257fde29c7a
271 | tag: tip
271 | tag: tip
272 | user: test
272 | user: test
273 | date: Thu Jan 01 00:00:00 1970 +0000
273 | date: Thu Jan 01 00:00:00 1970 +0000
274 | summary: A0
274 | summary: A0
275 |
275 |
276 o changeset: 2:337fec4d2edc
276 o changeset: 2:337fec4d2edc
277 | parent: 0:ea207398892e
277 | parent: 0:ea207398892e
278 | user: test
278 | user: test
279 | date: Thu Jan 01 00:00:00 1970 +0000
279 | date: Thu Jan 01 00:00:00 1970 +0000
280 | summary: A0
280 | summary: A0
281 |
281 |
282 | x changeset: 1:471597cad322
282 | x changeset: 1:471597cad322
283 |/ user: test
283 |/ user: test
284 | date: Thu Jan 01 00:00:00 1970 +0000
284 | date: Thu Jan 01 00:00:00 1970 +0000
285 | summary: A0
285 | summary: A0
286 |
286 |
287 o changeset: 0:ea207398892e
287 o changeset: 0:ea207398892e
288 user: test
288 user: test
289 date: Thu Jan 01 00:00:00 1970 +0000
289 date: Thu Jan 01 00:00:00 1970 +0000
290 summary: ROOT
290 summary: ROOT
291
291
292 Check templates
292 Check templates
293 ---------------
293 ---------------
294
294
295 $ hg up 'obsolete()' --hidden
295 $ hg up 'obsolete()' --hidden
296 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
296 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
297
297
298 Predecessors template should show current revision as it is the working copy
298 Predecessors template should show current revision as it is the working copy
299 $ hg tlog
299 $ hg tlog
300 o f257fde29c7a
300 o f257fde29c7a
301 | Predecessors: 1:471597cad322
301 | Predecessors: 1:471597cad322
302 | semi-colon: 1:471597cad322
302 | semi-colon: 1:471597cad322
303 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
303 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
304 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
304 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
305 o 337fec4d2edc
305 o 337fec4d2edc
306 | Predecessors: 1:471597cad322
306 | Predecessors: 1:471597cad322
307 | semi-colon: 1:471597cad322
307 | semi-colon: 1:471597cad322
308 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
308 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
309 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
309 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
310 | @ 471597cad322
310 | @ 471597cad322
311 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
311 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
312 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
312 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
313 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
313 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
314 o ea207398892e
314 o ea207398892e
315
315
316
316
317 $ hg fatelog
317 $ hg fatelog
318 o f257fde29c7a
318 o f257fde29c7a
319 |
319 |
320 o 337fec4d2edc
320 o 337fec4d2edc
321 |
321 |
322 | @ 471597cad322
322 | @ 471597cad322
323 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
323 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
324 o ea207398892e
324 o ea207398892e
325
325
326 $ hg up f257fde29c7a
326 $ hg up f257fde29c7a
327 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
327 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
328
328
329 Predecessors template should not show a predecessor as it's not displayed in
329 Predecessors template should not show a predecessor as it's not displayed in
330 the log
330 the log
331 $ hg tlog
331 $ hg tlog
332 @ f257fde29c7a
332 @ f257fde29c7a
333 |
333 |
334 o 337fec4d2edc
334 o 337fec4d2edc
335 |
335 |
336 o ea207398892e
336 o ea207398892e
337
337
338 Predecessors template should show both predecessors as we force their display
338 Predecessors template should show both predecessors as we force their display
339 with --hidden
339 with --hidden
340 $ hg tlog --hidden
340 $ hg tlog --hidden
341 @ f257fde29c7a
341 @ f257fde29c7a
342 | Predecessors: 1:471597cad322
342 | Predecessors: 1:471597cad322
343 | semi-colon: 1:471597cad322
343 | semi-colon: 1:471597cad322
344 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
344 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
345 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
345 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
346 o 337fec4d2edc
346 o 337fec4d2edc
347 | Predecessors: 1:471597cad322
347 | Predecessors: 1:471597cad322
348 | semi-colon: 1:471597cad322
348 | semi-colon: 1:471597cad322
349 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
349 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
350 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
350 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
351 | x 471597cad322
351 | x 471597cad322
352 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
352 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
353 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
353 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
354 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
354 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
355 o ea207398892e
355 o ea207398892e
356
356
357
357
358 $ hg fatelog --hidden
358 $ hg fatelog --hidden
359 @ f257fde29c7a
359 @ f257fde29c7a
360 |
360 |
361 o 337fec4d2edc
361 o 337fec4d2edc
362 |
362 |
363 | x 471597cad322
363 | x 471597cad322
364 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
364 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
365 o ea207398892e
365 o ea207398892e
366
366
367 $ hg fatelogjson --hidden
367 $ hg fatelogjson --hidden
368 @ f257fde29c7a
368 @ f257fde29c7a
369 |
369 |
370 o 337fec4d2edc
370 o 337fec4d2edc
371 |
371 |
372 | x 471597cad322
372 | x 471597cad322
373 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
373 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
374 o ea207398892e
374 o ea207398892e
375
375
376 Test templates with folded commit
376 Test templates with folded commit
377 =================================
377 =================================
378
378
379 Test setup
379 Test setup
380 ----------
380 ----------
381
381
382 $ hg init $TESTTMP/templates-local-fold
382 $ hg init $TESTTMP/templates-local-fold
383 $ cd $TESTTMP/templates-local-fold
383 $ cd $TESTTMP/templates-local-fold
384 $ mkcommit ROOT
384 $ mkcommit ROOT
385 $ mkcommit A0
385 $ mkcommit A0
386 $ mkcommit B0
386 $ mkcommit B0
387 $ hg log --hidden -G
387 $ hg log --hidden -G
388 @ changeset: 2:0dec01379d3b
388 @ changeset: 2:0dec01379d3b
389 | tag: tip
389 | tag: tip
390 | user: test
390 | user: test
391 | date: Thu Jan 01 00:00:00 1970 +0000
391 | date: Thu Jan 01 00:00:00 1970 +0000
392 | summary: B0
392 | summary: B0
393 |
393 |
394 o changeset: 1:471f378eab4c
394 o changeset: 1:471f378eab4c
395 | user: test
395 | user: test
396 | date: Thu Jan 01 00:00:00 1970 +0000
396 | date: Thu Jan 01 00:00:00 1970 +0000
397 | summary: A0
397 | summary: A0
398 |
398 |
399 o changeset: 0:ea207398892e
399 o changeset: 0:ea207398892e
400 user: test
400 user: test
401 date: Thu Jan 01 00:00:00 1970 +0000
401 date: Thu Jan 01 00:00:00 1970 +0000
402 summary: ROOT
402 summary: ROOT
403
403
404 Simulate a fold
404 Simulate a fold
405 $ hg up -r "desc(ROOT)"
405 $ hg up -r "desc(ROOT)"
406 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
406 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
407 $ echo "A0" > A0
407 $ echo "A0" > A0
408 $ echo "B0" > B0
408 $ echo "B0" > B0
409 $ hg commit -A -m "C0"
409 $ hg commit -A -m "C0"
410 adding A0
410 adding A0
411 adding B0
411 adding B0
412 created new head
412 created new head
413 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
413 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
414 obsoleted 1 changesets
414 obsoleted 1 changesets
415 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
415 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
416 obsoleted 1 changesets
416 obsoleted 1 changesets
417
417
418 $ hg log --hidden -G
418 $ hg log --hidden -G
419 @ changeset: 3:eb5a0daa2192
419 @ changeset: 3:eb5a0daa2192
420 | tag: tip
420 | tag: tip
421 | parent: 0:ea207398892e
421 | parent: 0:ea207398892e
422 | user: test
422 | user: test
423 | date: Thu Jan 01 00:00:00 1970 +0000
423 | date: Thu Jan 01 00:00:00 1970 +0000
424 | summary: C0
424 | summary: C0
425 |
425 |
426 | x changeset: 2:0dec01379d3b
426 | x changeset: 2:0dec01379d3b
427 | | user: test
427 | | user: test
428 | | date: Thu Jan 01 00:00:00 1970 +0000
428 | | date: Thu Jan 01 00:00:00 1970 +0000
429 | | summary: B0
429 | | summary: B0
430 | |
430 | |
431 | x changeset: 1:471f378eab4c
431 | x changeset: 1:471f378eab4c
432 |/ user: test
432 |/ user: test
433 | date: Thu Jan 01 00:00:00 1970 +0000
433 | date: Thu Jan 01 00:00:00 1970 +0000
434 | summary: A0
434 | summary: A0
435 |
435 |
436 o changeset: 0:ea207398892e
436 o changeset: 0:ea207398892e
437 user: test
437 user: test
438 date: Thu Jan 01 00:00:00 1970 +0000
438 date: Thu Jan 01 00:00:00 1970 +0000
439 summary: ROOT
439 summary: ROOT
440
440
441 Check templates
441 Check templates
442 ---------------
442 ---------------
443
443
444 $ hg up 'desc(A0)' --hidden
444 $ hg up 'desc(A0)' --hidden
445 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
445 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
446
446
447 Predecessors template should show current revision as it is the working copy
447 Predecessors template should show current revision as it is the working copy
448 $ hg tlog
448 $ hg tlog
449 o eb5a0daa2192
449 o eb5a0daa2192
450 | Predecessors: 1:471f378eab4c
450 | Predecessors: 1:471f378eab4c
451 | semi-colon: 1:471f378eab4c
451 | semi-colon: 1:471f378eab4c
452 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
452 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
453 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
453 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
454 | @ 471f378eab4c
454 | @ 471f378eab4c
455 |/ Successors: 3:eb5a0daa2192
455 |/ Successors: 3:eb5a0daa2192
456 | multi-line: 3:eb5a0daa2192
456 | multi-line: 3:eb5a0daa2192
457 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
457 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
458 o ea207398892e
458 o ea207398892e
459
459
460
460
461 $ hg fatelog
461 $ hg fatelog
462 o eb5a0daa2192
462 o eb5a0daa2192
463 |
463 |
464 | @ 471f378eab4c
464 | @ 471f378eab4c
465 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
465 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
466 o ea207398892e
466 o ea207398892e
467
467
468 $ hg up 'desc(B0)' --hidden
468 $ hg up 'desc(B0)' --hidden
469 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
469 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
470
470
471 Predecessors template should show both predecessors as they should be both
471 Predecessors template should show both predecessors as they should be both
472 displayed
472 displayed
473 $ hg tlog
473 $ hg tlog
474 o eb5a0daa2192
474 o eb5a0daa2192
475 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
475 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
476 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
476 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
477 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
477 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
478 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
478 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
479 | @ 0dec01379d3b
479 | @ 0dec01379d3b
480 | | Successors: 3:eb5a0daa2192
480 | | Successors: 3:eb5a0daa2192
481 | | multi-line: 3:eb5a0daa2192
481 | | multi-line: 3:eb5a0daa2192
482 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
482 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
483 | x 471f378eab4c
483 | x 471f378eab4c
484 |/ Successors: 3:eb5a0daa2192
484 |/ Successors: 3:eb5a0daa2192
485 | multi-line: 3:eb5a0daa2192
485 | multi-line: 3:eb5a0daa2192
486 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
486 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
487 o ea207398892e
487 o ea207398892e
488
488
489
489
490 $ hg fatelog
490 $ hg fatelog
491 o eb5a0daa2192
491 o eb5a0daa2192
492 |
492 |
493 | @ 0dec01379d3b
493 | @ 0dec01379d3b
494 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
494 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
495 | x 471f378eab4c
495 | x 471f378eab4c
496 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
496 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
497 o ea207398892e
497 o ea207398892e
498
498
499 $ hg up 'desc(C0)'
499 $ hg up 'desc(C0)'
500 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
500 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
501
501
502 Predecessors template should not show predecessors as they are not displayed in
502 Predecessors template should not show predecessors as they are not displayed in
503 the log
503 the log
504 $ hg tlog
504 $ hg tlog
505 @ eb5a0daa2192
505 @ eb5a0daa2192
506 |
506 |
507 o ea207398892e
507 o ea207398892e
508
508
509 Predecessors template should show both predecessors as we force their display
509 Predecessors template should show both predecessors as we force their display
510 with --hidden
510 with --hidden
511 $ hg tlog --hidden
511 $ hg tlog --hidden
512 @ eb5a0daa2192
512 @ eb5a0daa2192
513 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
513 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
514 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
514 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
515 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
515 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
516 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
516 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
517 | x 0dec01379d3b
517 | x 0dec01379d3b
518 | | Successors: 3:eb5a0daa2192
518 | | Successors: 3:eb5a0daa2192
519 | | multi-line: 3:eb5a0daa2192
519 | | multi-line: 3:eb5a0daa2192
520 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
520 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
521 | x 471f378eab4c
521 | x 471f378eab4c
522 |/ Successors: 3:eb5a0daa2192
522 |/ Successors: 3:eb5a0daa2192
523 | multi-line: 3:eb5a0daa2192
523 | multi-line: 3:eb5a0daa2192
524 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
524 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
525 o ea207398892e
525 o ea207398892e
526
526
527
527
528 $ hg fatelog --hidden
528 $ hg fatelog --hidden
529 @ eb5a0daa2192
529 @ eb5a0daa2192
530 |
530 |
531 | x 0dec01379d3b
531 | x 0dec01379d3b
532 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
532 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
533 | x 471f378eab4c
533 | x 471f378eab4c
534 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
534 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
535 o ea207398892e
535 o ea207398892e
536
536
537
537
538 $ hg fatelogjson --hidden
538 $ hg fatelogjson --hidden
539 @ eb5a0daa2192
539 @ eb5a0daa2192
540 |
540 |
541 | x 0dec01379d3b
541 | x 0dec01379d3b
542 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
542 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
543 | x 471f378eab4c
543 | x 471f378eab4c
544 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
544 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
545 o ea207398892e
545 o ea207398892e
546
546
547
547
548 Test templates with divergence
548 Test templates with divergence
549 ==============================
549 ==============================
550
550
551 Test setup
551 Test setup
552 ----------
552 ----------
553
553
554 $ hg init $TESTTMP/templates-local-divergence
554 $ hg init $TESTTMP/templates-local-divergence
555 $ cd $TESTTMP/templates-local-divergence
555 $ cd $TESTTMP/templates-local-divergence
556 $ mkcommit ROOT
556 $ mkcommit ROOT
557 $ mkcommit A0
557 $ mkcommit A0
558 $ hg commit --amend -m "A1"
558 $ hg commit --amend -m "A1"
559 $ hg log --hidden -G
559 $ hg log --hidden -G
560 @ changeset: 2:fdf9bde5129a
560 @ changeset: 2:fdf9bde5129a
561 | tag: tip
561 | tag: tip
562 | parent: 0:ea207398892e
562 | parent: 0:ea207398892e
563 | user: test
563 | user: test
564 | date: Thu Jan 01 00:00:00 1970 +0000
564 | date: Thu Jan 01 00:00:00 1970 +0000
565 | summary: A1
565 | summary: A1
566 |
566 |
567 | x changeset: 1:471f378eab4c
567 | x changeset: 1:471f378eab4c
568 |/ user: test
568 |/ user: test
569 | date: Thu Jan 01 00:00:00 1970 +0000
569 | date: Thu Jan 01 00:00:00 1970 +0000
570 | summary: A0
570 | summary: A0
571 |
571 |
572 o changeset: 0:ea207398892e
572 o changeset: 0:ea207398892e
573 user: test
573 user: test
574 date: Thu Jan 01 00:00:00 1970 +0000
574 date: Thu Jan 01 00:00:00 1970 +0000
575 summary: ROOT
575 summary: ROOT
576
576
577 $ hg update --hidden 'desc(A0)'
577 $ hg update --hidden 'desc(A0)'
578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
579 $ hg commit --amend -m "A2"
579 $ hg commit --amend -m "A2"
580 $ hg log --hidden -G
580 $ hg log --hidden -G
581 @ changeset: 3:65b757b745b9
581 @ changeset: 3:65b757b745b9
582 | tag: tip
582 | tag: tip
583 | parent: 0:ea207398892e
583 | parent: 0:ea207398892e
584 | user: test
584 | user: test
585 | date: Thu Jan 01 00:00:00 1970 +0000
585 | date: Thu Jan 01 00:00:00 1970 +0000
586 | instability: content-divergent
586 | instability: content-divergent
587 | summary: A2
587 | summary: A2
588 |
588 |
589 | o changeset: 2:fdf9bde5129a
589 | o changeset: 2:fdf9bde5129a
590 |/ parent: 0:ea207398892e
590 |/ parent: 0:ea207398892e
591 | user: test
591 | user: test
592 | date: Thu Jan 01 00:00:00 1970 +0000
592 | date: Thu Jan 01 00:00:00 1970 +0000
593 | instability: content-divergent
593 | instability: content-divergent
594 | summary: A1
594 | summary: A1
595 |
595 |
596 | x changeset: 1:471f378eab4c
596 | x changeset: 1:471f378eab4c
597 |/ user: test
597 |/ user: test
598 | date: Thu Jan 01 00:00:00 1970 +0000
598 | date: Thu Jan 01 00:00:00 1970 +0000
599 | summary: A0
599 | summary: A0
600 |
600 |
601 o changeset: 0:ea207398892e
601 o changeset: 0:ea207398892e
602 user: test
602 user: test
603 date: Thu Jan 01 00:00:00 1970 +0000
603 date: Thu Jan 01 00:00:00 1970 +0000
604 summary: ROOT
604 summary: ROOT
605
605
606 $ hg commit --amend -m 'A3'
606 $ hg commit --amend -m 'A3'
607 $ hg log --hidden -G
607 $ hg log --hidden -G
608 @ changeset: 4:019fadeab383
608 @ changeset: 4:019fadeab383
609 | tag: tip
609 | tag: tip
610 | parent: 0:ea207398892e
610 | parent: 0:ea207398892e
611 | user: test
611 | user: test
612 | date: Thu Jan 01 00:00:00 1970 +0000
612 | date: Thu Jan 01 00:00:00 1970 +0000
613 | instability: content-divergent
613 | instability: content-divergent
614 | summary: A3
614 | summary: A3
615 |
615 |
616 | x changeset: 3:65b757b745b9
616 | x changeset: 3:65b757b745b9
617 |/ parent: 0:ea207398892e
617 |/ parent: 0:ea207398892e
618 | user: test
618 | user: test
619 | date: Thu Jan 01 00:00:00 1970 +0000
619 | date: Thu Jan 01 00:00:00 1970 +0000
620 | summary: A2
620 | summary: A2
621 |
621 |
622 | o changeset: 2:fdf9bde5129a
622 | o changeset: 2:fdf9bde5129a
623 |/ parent: 0:ea207398892e
623 |/ parent: 0:ea207398892e
624 | user: test
624 | user: test
625 | date: Thu Jan 01 00:00:00 1970 +0000
625 | date: Thu Jan 01 00:00:00 1970 +0000
626 | instability: content-divergent
626 | instability: content-divergent
627 | summary: A1
627 | summary: A1
628 |
628 |
629 | x changeset: 1:471f378eab4c
629 | x changeset: 1:471f378eab4c
630 |/ user: test
630 |/ user: test
631 | date: Thu Jan 01 00:00:00 1970 +0000
631 | date: Thu Jan 01 00:00:00 1970 +0000
632 | summary: A0
632 | summary: A0
633 |
633 |
634 o changeset: 0:ea207398892e
634 o changeset: 0:ea207398892e
635 user: test
635 user: test
636 date: Thu Jan 01 00:00:00 1970 +0000
636 date: Thu Jan 01 00:00:00 1970 +0000
637 summary: ROOT
637 summary: ROOT
638
638
639
639
640 Check templates
640 Check templates
641 ---------------
641 ---------------
642
642
643 $ hg up 'desc(A0)' --hidden
643 $ hg up 'desc(A0)' --hidden
644 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
645
645
646 Predecessors template should show current revision as it is the working copy
646 Predecessors template should show current revision as it is the working copy
647 $ hg tlog
647 $ hg tlog
648 o 019fadeab383
648 o 019fadeab383
649 | Predecessors: 1:471f378eab4c
649 | Predecessors: 1:471f378eab4c
650 | semi-colon: 1:471f378eab4c
650 | semi-colon: 1:471f378eab4c
651 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
651 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
652 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
652 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
653 | o fdf9bde5129a
653 | o fdf9bde5129a
654 |/ Predecessors: 1:471f378eab4c
654 |/ Predecessors: 1:471f378eab4c
655 | semi-colon: 1:471f378eab4c
655 | semi-colon: 1:471f378eab4c
656 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
656 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
657 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
657 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
658 | @ 471f378eab4c
658 | @ 471f378eab4c
659 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
659 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
660 | multi-line: 2:fdf9bde5129a
660 | multi-line: 2:fdf9bde5129a
661 | multi-line: 4:019fadeab383
661 | multi-line: 4:019fadeab383
662 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
662 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
663 o ea207398892e
663 o ea207398892e
664
664
665 $ hg fatelog
665 $ hg fatelog
666 o 019fadeab383
666 o 019fadeab383
667 |
667 |
668 | o fdf9bde5129a
668 | o fdf9bde5129a
669 |/
669 |/
670 | @ 471f378eab4c
670 | @ 471f378eab4c
671 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
671 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
672 o ea207398892e
672 o ea207398892e
673
673
674 $ hg up 'desc(A1)'
674 $ hg up 'desc(A1)'
675 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
675 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
676
676
677 Predecessors template should not show predecessors as they are not displayed in
677 Predecessors template should not show predecessors as they are not displayed in
678 the log
678 the log
679 $ hg tlog
679 $ hg tlog
680 o 019fadeab383
680 o 019fadeab383
681 |
681 |
682 | @ fdf9bde5129a
682 | @ fdf9bde5129a
683 |/
683 |/
684 o ea207398892e
684 o ea207398892e
685
685
686
686
687 $ hg fatelog
687 $ hg fatelog
688 o 019fadeab383
688 o 019fadeab383
689 |
689 |
690 | @ fdf9bde5129a
690 | @ fdf9bde5129a
691 |/
691 |/
692 o ea207398892e
692 o ea207398892e
693
693
694 Predecessors template should the predecessors as we force their display with
694 Predecessors template should the predecessors as we force their display with
695 --hidden
695 --hidden
696 $ hg tlog --hidden
696 $ hg tlog --hidden
697 o 019fadeab383
697 o 019fadeab383
698 | Predecessors: 3:65b757b745b9
698 | Predecessors: 3:65b757b745b9
699 | semi-colon: 3:65b757b745b9
699 | semi-colon: 3:65b757b745b9
700 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
700 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
701 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
701 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
702 | x 65b757b745b9
702 | x 65b757b745b9
703 |/ Predecessors: 1:471f378eab4c
703 |/ Predecessors: 1:471f378eab4c
704 | semi-colon: 1:471f378eab4c
704 | semi-colon: 1:471f378eab4c
705 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
705 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
706 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
706 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
707 | Successors: 4:019fadeab383
707 | Successors: 4:019fadeab383
708 | multi-line: 4:019fadeab383
708 | multi-line: 4:019fadeab383
709 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
709 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
710 | @ fdf9bde5129a
710 | @ fdf9bde5129a
711 |/ Predecessors: 1:471f378eab4c
711 |/ Predecessors: 1:471f378eab4c
712 | semi-colon: 1:471f378eab4c
712 | semi-colon: 1:471f378eab4c
713 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
713 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
714 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
714 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
715 | x 471f378eab4c
715 | x 471f378eab4c
716 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
716 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
717 | multi-line: 2:fdf9bde5129a
717 | multi-line: 2:fdf9bde5129a
718 | multi-line: 3:65b757b745b9
718 | multi-line: 3:65b757b745b9
719 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
719 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
720 o ea207398892e
720 o ea207398892e
721
721
722
722
723 $ hg fatelog --hidden
723 $ hg fatelog --hidden
724 o 019fadeab383
724 o 019fadeab383
725 |
725 |
726 | x 65b757b745b9
726 | x 65b757b745b9
727 |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
727 |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
728 | @ fdf9bde5129a
728 | @ fdf9bde5129a
729 |/
729 |/
730 | x 471f378eab4c
730 | x 471f378eab4c
731 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
731 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
732 o ea207398892e
732 o ea207398892e
733
733
734
734
735 $ hg fatelogjson --hidden
735 $ hg fatelogjson --hidden
736 o 019fadeab383
736 o 019fadeab383
737 |
737 |
738 | x 65b757b745b9
738 | x 65b757b745b9
739 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
739 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
740 | @ fdf9bde5129a
740 | @ fdf9bde5129a
741 |/
741 |/
742 | x 471f378eab4c
742 | x 471f378eab4c
743 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
743 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
744 o ea207398892e
744 o ea207398892e
745
745
746
746
747 Test templates with amended + folded commit
747 Test templates with amended + folded commit
748 ===========================================
748 ===========================================
749
749
750 Test setup
750 Test setup
751 ----------
751 ----------
752
752
753 $ hg init $TESTTMP/templates-local-amend-fold
753 $ hg init $TESTTMP/templates-local-amend-fold
754 $ cd $TESTTMP/templates-local-amend-fold
754 $ cd $TESTTMP/templates-local-amend-fold
755 $ mkcommit ROOT
755 $ mkcommit ROOT
756 $ mkcommit A0
756 $ mkcommit A0
757 $ mkcommit B0
757 $ mkcommit B0
758 $ hg commit --amend -m "B1"
758 $ hg commit --amend -m "B1"
759 $ hg log --hidden -G
759 $ hg log --hidden -G
760 @ changeset: 3:b7ea6d14e664
760 @ changeset: 3:b7ea6d14e664
761 | tag: tip
761 | tag: tip
762 | parent: 1:471f378eab4c
762 | parent: 1:471f378eab4c
763 | user: test
763 | user: test
764 | date: Thu Jan 01 00:00:00 1970 +0000
764 | date: Thu Jan 01 00:00:00 1970 +0000
765 | summary: B1
765 | summary: B1
766 |
766 |
767 | x changeset: 2:0dec01379d3b
767 | x changeset: 2:0dec01379d3b
768 |/ user: test
768 |/ user: test
769 | date: Thu Jan 01 00:00:00 1970 +0000
769 | date: Thu Jan 01 00:00:00 1970 +0000
770 | summary: B0
770 | summary: B0
771 |
771 |
772 o changeset: 1:471f378eab4c
772 o changeset: 1:471f378eab4c
773 | user: test
773 | user: test
774 | date: Thu Jan 01 00:00:00 1970 +0000
774 | date: Thu Jan 01 00:00:00 1970 +0000
775 | summary: A0
775 | summary: A0
776 |
776 |
777 o changeset: 0:ea207398892e
777 o changeset: 0:ea207398892e
778 user: test
778 user: test
779 date: Thu Jan 01 00:00:00 1970 +0000
779 date: Thu Jan 01 00:00:00 1970 +0000
780 summary: ROOT
780 summary: ROOT
781
781
782 # Simulate a fold
782 # Simulate a fold
783 $ hg up -r "desc(ROOT)"
783 $ hg up -r "desc(ROOT)"
784 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
784 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
785 $ echo "A0" > A0
785 $ echo "A0" > A0
786 $ echo "B0" > B0
786 $ echo "B0" > B0
787 $ hg commit -A -m "C0"
787 $ hg commit -A -m "C0"
788 adding A0
788 adding A0
789 adding B0
789 adding B0
790 created new head
790 created new head
791 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
791 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
792 obsoleted 1 changesets
792 obsoleted 1 changesets
793 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
793 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
794 obsoleted 1 changesets
794 obsoleted 1 changesets
795
795
796 $ hg log --hidden -G
796 $ hg log --hidden -G
797 @ changeset: 4:eb5a0daa2192
797 @ changeset: 4:eb5a0daa2192
798 | tag: tip
798 | tag: tip
799 | parent: 0:ea207398892e
799 | parent: 0:ea207398892e
800 | user: test
800 | user: test
801 | date: Thu Jan 01 00:00:00 1970 +0000
801 | date: Thu Jan 01 00:00:00 1970 +0000
802 | summary: C0
802 | summary: C0
803 |
803 |
804 | x changeset: 3:b7ea6d14e664
804 | x changeset: 3:b7ea6d14e664
805 | | parent: 1:471f378eab4c
805 | | parent: 1:471f378eab4c
806 | | user: test
806 | | user: test
807 | | date: Thu Jan 01 00:00:00 1970 +0000
807 | | date: Thu Jan 01 00:00:00 1970 +0000
808 | | summary: B1
808 | | summary: B1
809 | |
809 | |
810 | | x changeset: 2:0dec01379d3b
810 | | x changeset: 2:0dec01379d3b
811 | |/ user: test
811 | |/ user: test
812 | | date: Thu Jan 01 00:00:00 1970 +0000
812 | | date: Thu Jan 01 00:00:00 1970 +0000
813 | | summary: B0
813 | | summary: B0
814 | |
814 | |
815 | x changeset: 1:471f378eab4c
815 | x changeset: 1:471f378eab4c
816 |/ user: test
816 |/ user: test
817 | date: Thu Jan 01 00:00:00 1970 +0000
817 | date: Thu Jan 01 00:00:00 1970 +0000
818 | summary: A0
818 | summary: A0
819 |
819 |
820 o changeset: 0:ea207398892e
820 o changeset: 0:ea207398892e
821 user: test
821 user: test
822 date: Thu Jan 01 00:00:00 1970 +0000
822 date: Thu Jan 01 00:00:00 1970 +0000
823 summary: ROOT
823 summary: ROOT
824
824
825 Check templates
825 Check templates
826 ---------------
826 ---------------
827
827
828 $ hg up 'desc(A0)' --hidden
828 $ hg up 'desc(A0)' --hidden
829 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
829 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
830
830
831 Predecessors template should show current revision as it is the working copy
831 Predecessors template should show current revision as it is the working copy
832 $ hg tlog
832 $ hg tlog
833 o eb5a0daa2192
833 o eb5a0daa2192
834 | Predecessors: 1:471f378eab4c
834 | Predecessors: 1:471f378eab4c
835 | semi-colon: 1:471f378eab4c
835 | semi-colon: 1:471f378eab4c
836 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
836 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
837 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
837 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
838 | @ 471f378eab4c
838 | @ 471f378eab4c
839 |/ Successors: 4:eb5a0daa2192
839 |/ Successors: 4:eb5a0daa2192
840 | multi-line: 4:eb5a0daa2192
840 | multi-line: 4:eb5a0daa2192
841 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
841 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
842 o ea207398892e
842 o ea207398892e
843
843
844
844
845 $ hg fatelog
845 $ hg fatelog
846 o eb5a0daa2192
846 o eb5a0daa2192
847 |
847 |
848 | @ 471f378eab4c
848 | @ 471f378eab4c
849 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
849 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
850 o ea207398892e
850 o ea207398892e
851
851
852 $ hg up 'desc(B0)' --hidden
852 $ hg up 'desc(B0)' --hidden
853 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
853 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
854
854
855 Predecessors template should both predecessors as they are visible
855 Predecessors template should both predecessors as they are visible
856 $ hg tlog
856 $ hg tlog
857 o eb5a0daa2192
857 o eb5a0daa2192
858 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
858 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
859 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
859 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
860 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
860 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
861 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
861 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
862 | @ 0dec01379d3b
862 | @ 0dec01379d3b
863 | | Successors: 4:eb5a0daa2192
863 | | Successors: 4:eb5a0daa2192
864 | | multi-line: 4:eb5a0daa2192
864 | | multi-line: 4:eb5a0daa2192
865 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
865 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
866 | x 471f378eab4c
866 | x 471f378eab4c
867 |/ Successors: 4:eb5a0daa2192
867 |/ Successors: 4:eb5a0daa2192
868 | multi-line: 4:eb5a0daa2192
868 | multi-line: 4:eb5a0daa2192
869 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
869 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
870 o ea207398892e
870 o ea207398892e
871
871
872
872
873 $ hg fatelog
873 $ hg fatelog
874 o eb5a0daa2192
874 o eb5a0daa2192
875 |
875 |
876 | @ 0dec01379d3b
876 | @ 0dec01379d3b
877 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
877 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
878 | x 471f378eab4c
878 | x 471f378eab4c
879 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
879 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
880 o ea207398892e
880 o ea207398892e
881
881
882 $ hg up 'desc(B1)' --hidden
882 $ hg up 'desc(B1)' --hidden
883 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
883 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
884
884
885 Predecessors template should both predecessors as they are visible
885 Predecessors template should both predecessors as they are visible
886 $ hg tlog
886 $ hg tlog
887 o eb5a0daa2192
887 o eb5a0daa2192
888 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
888 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
889 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
889 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
890 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
890 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
891 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
891 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
892 | @ b7ea6d14e664
892 | @ b7ea6d14e664
893 | | Successors: 4:eb5a0daa2192
893 | | Successors: 4:eb5a0daa2192
894 | | multi-line: 4:eb5a0daa2192
894 | | multi-line: 4:eb5a0daa2192
895 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
895 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
896 | x 471f378eab4c
896 | x 471f378eab4c
897 |/ Successors: 4:eb5a0daa2192
897 |/ Successors: 4:eb5a0daa2192
898 | multi-line: 4:eb5a0daa2192
898 | multi-line: 4:eb5a0daa2192
899 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
899 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
900 o ea207398892e
900 o ea207398892e
901
901
902
902
903 $ hg fatelog
903 $ hg fatelog
904 o eb5a0daa2192
904 o eb5a0daa2192
905 |
905 |
906 | @ b7ea6d14e664
906 | @ b7ea6d14e664
907 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
907 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
908 | x 471f378eab4c
908 | x 471f378eab4c
909 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
909 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
910 o ea207398892e
910 o ea207398892e
911
911
912 $ hg up 'desc(C0)'
912 $ hg up 'desc(C0)'
913 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
913 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
914
914
915 Predecessors template should show no predecessors as they are both non visible
915 Predecessors template should show no predecessors as they are both non visible
916 $ hg tlog
916 $ hg tlog
917 @ eb5a0daa2192
917 @ eb5a0daa2192
918 |
918 |
919 o ea207398892e
919 o ea207398892e
920
920
921
921
922 $ hg fatelog
922 $ hg fatelog
923 @ eb5a0daa2192
923 @ eb5a0daa2192
924 |
924 |
925 o ea207398892e
925 o ea207398892e
926
926
927 Predecessors template should show all predecessors as we force their display
927 Predecessors template should show all predecessors as we force their display
928 with --hidden
928 with --hidden
929 $ hg tlog --hidden
929 $ hg tlog --hidden
930 @ eb5a0daa2192
930 @ eb5a0daa2192
931 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
931 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
932 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
932 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
933 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
933 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
934 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
934 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
935 | x b7ea6d14e664
935 | x b7ea6d14e664
936 | | Predecessors: 2:0dec01379d3b
936 | | Predecessors: 2:0dec01379d3b
937 | | semi-colon: 2:0dec01379d3b
937 | | semi-colon: 2:0dec01379d3b
938 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
938 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
939 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
939 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
940 | | Successors: 4:eb5a0daa2192
940 | | Successors: 4:eb5a0daa2192
941 | | multi-line: 4:eb5a0daa2192
941 | | multi-line: 4:eb5a0daa2192
942 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
942 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
943 | | x 0dec01379d3b
943 | | x 0dec01379d3b
944 | |/ Successors: 3:b7ea6d14e664
944 | |/ Successors: 3:b7ea6d14e664
945 | | multi-line: 3:b7ea6d14e664
945 | | multi-line: 3:b7ea6d14e664
946 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
946 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
947 | x 471f378eab4c
947 | x 471f378eab4c
948 |/ Successors: 4:eb5a0daa2192
948 |/ Successors: 4:eb5a0daa2192
949 | multi-line: 4:eb5a0daa2192
949 | multi-line: 4:eb5a0daa2192
950 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
950 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
951 o ea207398892e
951 o ea207398892e
952
952
953
953
954 $ hg fatelog --hidden
954 $ hg fatelog --hidden
955 @ eb5a0daa2192
955 @ eb5a0daa2192
956 |
956 |
957 | x b7ea6d14e664
957 | x b7ea6d14e664
958 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
958 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
959 | | x 0dec01379d3b
959 | | x 0dec01379d3b
960 | |/ Obsfate: rewritten as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
960 | |/ Obsfate: rewritten as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
961 | x 471f378eab4c
961 | x 471f378eab4c
962 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
962 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
963 o ea207398892e
963 o ea207398892e
964
964
965
965
966 $ hg fatelogjson --hidden
966 $ hg fatelogjson --hidden
967 @ eb5a0daa2192
967 @ eb5a0daa2192
968 |
968 |
969 | x b7ea6d14e664
969 | x b7ea6d14e664
970 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
970 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
971 | | x 0dec01379d3b
971 | | x 0dec01379d3b
972 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
972 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
973 | x 471f378eab4c
973 | x 471f378eab4c
974 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
974 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
975 o ea207398892e
975 o ea207398892e
976
976
977
977
978 Test template with pushed and pulled obs markers
978 Test template with pushed and pulled obs markers
979 ================================================
979 ================================================
980
980
981 Test setup
981 Test setup
982 ----------
982 ----------
983
983
984 $ hg init $TESTTMP/templates-local-remote-markers-1
984 $ hg init $TESTTMP/templates-local-remote-markers-1
985 $ cd $TESTTMP/templates-local-remote-markers-1
985 $ cd $TESTTMP/templates-local-remote-markers-1
986 $ mkcommit ROOT
986 $ mkcommit ROOT
987 $ mkcommit A0
987 $ mkcommit A0
988 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
988 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
989 updating to branch default
989 updating to branch default
990 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
990 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
991 $ cd $TESTTMP/templates-local-remote-markers-2
991 $ cd $TESTTMP/templates-local-remote-markers-2
992 $ hg log --hidden -G
992 $ hg log --hidden -G
993 @ changeset: 1:471f378eab4c
993 @ changeset: 1:471f378eab4c
994 | tag: tip
994 | tag: tip
995 | user: test
995 | user: test
996 | date: Thu Jan 01 00:00:00 1970 +0000
996 | date: Thu Jan 01 00:00:00 1970 +0000
997 | summary: A0
997 | summary: A0
998 |
998 |
999 o changeset: 0:ea207398892e
999 o changeset: 0:ea207398892e
1000 user: test
1000 user: test
1001 date: Thu Jan 01 00:00:00 1970 +0000
1001 date: Thu Jan 01 00:00:00 1970 +0000
1002 summary: ROOT
1002 summary: ROOT
1003
1003
1004 $ cd $TESTTMP/templates-local-remote-markers-1
1004 $ cd $TESTTMP/templates-local-remote-markers-1
1005 $ hg commit --amend -m "A1"
1005 $ hg commit --amend -m "A1"
1006 $ hg commit --amend -m "A2"
1006 $ hg commit --amend -m "A2"
1007 $ hg log --hidden -G
1007 $ hg log --hidden -G
1008 @ changeset: 3:7a230b46bf61
1008 @ changeset: 3:7a230b46bf61
1009 | tag: tip
1009 | tag: tip
1010 | parent: 0:ea207398892e
1010 | parent: 0:ea207398892e
1011 | user: test
1011 | user: test
1012 | date: Thu Jan 01 00:00:00 1970 +0000
1012 | date: Thu Jan 01 00:00:00 1970 +0000
1013 | summary: A2
1013 | summary: A2
1014 |
1014 |
1015 | x changeset: 2:fdf9bde5129a
1015 | x changeset: 2:fdf9bde5129a
1016 |/ parent: 0:ea207398892e
1016 |/ parent: 0:ea207398892e
1017 | user: test
1017 | user: test
1018 | date: Thu Jan 01 00:00:00 1970 +0000
1018 | date: Thu Jan 01 00:00:00 1970 +0000
1019 | summary: A1
1019 | summary: A1
1020 |
1020 |
1021 | x changeset: 1:471f378eab4c
1021 | x changeset: 1:471f378eab4c
1022 |/ user: test
1022 |/ user: test
1023 | date: Thu Jan 01 00:00:00 1970 +0000
1023 | date: Thu Jan 01 00:00:00 1970 +0000
1024 | summary: A0
1024 | summary: A0
1025 |
1025 |
1026 o changeset: 0:ea207398892e
1026 o changeset: 0:ea207398892e
1027 user: test
1027 user: test
1028 date: Thu Jan 01 00:00:00 1970 +0000
1028 date: Thu Jan 01 00:00:00 1970 +0000
1029 summary: ROOT
1029 summary: ROOT
1030
1030
1031 $ cd $TESTTMP/templates-local-remote-markers-2
1031 $ cd $TESTTMP/templates-local-remote-markers-2
1032 $ hg pull
1032 $ hg pull
1033 pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1033 pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1034 searching for changes
1034 searching for changes
1035 adding changesets
1035 adding changesets
1036 adding manifests
1036 adding manifests
1037 adding file changes
1037 adding file changes
1038 added 1 changesets with 0 changes to 1 files (+1 heads)
1038 added 1 changesets with 0 changes to 1 files (+1 heads)
1039 2 new obsolescence markers
1039 2 new obsolescence markers
1040 obsoleted 1 changesets
1040 obsoleted 1 changesets
1041 (run 'hg heads' to see heads, 'hg merge' to merge)
1041 (run 'hg heads' to see heads, 'hg merge' to merge)
1042 $ hg log --hidden -G
1042 $ hg log --hidden -G
1043 o changeset: 2:7a230b46bf61
1043 o changeset: 2:7a230b46bf61
1044 | tag: tip
1044 | tag: tip
1045 | parent: 0:ea207398892e
1045 | parent: 0:ea207398892e
1046 | user: test
1046 | user: test
1047 | date: Thu Jan 01 00:00:00 1970 +0000
1047 | date: Thu Jan 01 00:00:00 1970 +0000
1048 | summary: A2
1048 | summary: A2
1049 |
1049 |
1050 | @ changeset: 1:471f378eab4c
1050 | @ changeset: 1:471f378eab4c
1051 |/ user: test
1051 |/ user: test
1052 | date: Thu Jan 01 00:00:00 1970 +0000
1052 | date: Thu Jan 01 00:00:00 1970 +0000
1053 | summary: A0
1053 | summary: A0
1054 |
1054 |
1055 o changeset: 0:ea207398892e
1055 o changeset: 0:ea207398892e
1056 user: test
1056 user: test
1057 date: Thu Jan 01 00:00:00 1970 +0000
1057 date: Thu Jan 01 00:00:00 1970 +0000
1058 summary: ROOT
1058 summary: ROOT
1059
1059
1060
1060
1061 $ hg debugobsolete
1061 $ hg debugobsolete
1062 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1062 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1063 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1063 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1064
1064
1065 Check templates
1065 Check templates
1066 ---------------
1066 ---------------
1067
1067
1068 Predecessors template should show current revision as it is the working copy
1068 Predecessors template should show current revision as it is the working copy
1069 $ hg tlog
1069 $ hg tlog
1070 o 7a230b46bf61
1070 o 7a230b46bf61
1071 | Predecessors: 1:471f378eab4c
1071 | Predecessors: 1:471f378eab4c
1072 | semi-colon: 1:471f378eab4c
1072 | semi-colon: 1:471f378eab4c
1073 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1073 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1074 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1074 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1075 | @ 471f378eab4c
1075 | @ 471f378eab4c
1076 |/ Successors: 2:7a230b46bf61
1076 |/ Successors: 2:7a230b46bf61
1077 | multi-line: 2:7a230b46bf61
1077 | multi-line: 2:7a230b46bf61
1078 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1078 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1079 o ea207398892e
1079 o ea207398892e
1080
1080
1081
1081
1082 $ hg fatelog
1082 $ hg fatelog
1083 o 7a230b46bf61
1083 o 7a230b46bf61
1084 |
1084 |
1085 | @ 471f378eab4c
1085 | @ 471f378eab4c
1086 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1086 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1087 o ea207398892e
1087 o ea207398892e
1088
1088
1089 $ hg up 'desc(A2)'
1089 $ hg up 'desc(A2)'
1090 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1090 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1091
1091
1092 Predecessors template should show no predecessors as they are non visible
1092 Predecessors template should show no predecessors as they are non visible
1093 $ hg tlog
1093 $ hg tlog
1094 @ 7a230b46bf61
1094 @ 7a230b46bf61
1095 |
1095 |
1096 o ea207398892e
1096 o ea207398892e
1097
1097
1098
1098
1099 $ hg fatelog
1099 $ hg fatelog
1100 @ 7a230b46bf61
1100 @ 7a230b46bf61
1101 |
1101 |
1102 o ea207398892e
1102 o ea207398892e
1103
1103
1104 Predecessors template should show all predecessors as we force their display
1104 Predecessors template should show all predecessors as we force their display
1105 with --hidden
1105 with --hidden
1106 $ hg tlog --hidden
1106 $ hg tlog --hidden
1107 @ 7a230b46bf61
1107 @ 7a230b46bf61
1108 | Predecessors: 1:471f378eab4c
1108 | Predecessors: 1:471f378eab4c
1109 | semi-colon: 1:471f378eab4c
1109 | semi-colon: 1:471f378eab4c
1110 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1110 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1111 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1111 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1112 | x 471f378eab4c
1112 | x 471f378eab4c
1113 |/ Successors: 2:7a230b46bf61
1113 |/ Successors: 2:7a230b46bf61
1114 | multi-line: 2:7a230b46bf61
1114 | multi-line: 2:7a230b46bf61
1115 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1115 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1116 o ea207398892e
1116 o ea207398892e
1117
1117
1118
1118
1119 $ hg fatelog --hidden
1119 $ hg fatelog --hidden
1120 @ 7a230b46bf61
1120 @ 7a230b46bf61
1121 |
1121 |
1122 | x 471f378eab4c
1122 | x 471f378eab4c
1123 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1123 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1124 o ea207398892e
1124 o ea207398892e
1125
1125
1126
1126
1127 Test template with obsmarkers cycle
1127 Test template with obsmarkers cycle
1128 ===================================
1128 ===================================
1129
1129
1130 Test setup
1130 Test setup
1131 ----------
1131 ----------
1132
1132
1133 $ hg init $TESTTMP/templates-local-cycle
1133 $ hg init $TESTTMP/templates-local-cycle
1134 $ cd $TESTTMP/templates-local-cycle
1134 $ cd $TESTTMP/templates-local-cycle
1135 $ mkcommit ROOT
1135 $ mkcommit ROOT
1136 $ mkcommit A0
1136 $ mkcommit A0
1137 $ mkcommit B0
1137 $ mkcommit B0
1138 $ hg up -r 0
1138 $ hg up -r 0
1139 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1139 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1140 $ mkcommit C0
1140 $ mkcommit C0
1141 created new head
1141 created new head
1142
1142
1143 Create the cycle
1143 Create the cycle
1144
1144
1145 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1145 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1146 obsoleted 1 changesets
1146 obsoleted 1 changesets
1147 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1147 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1148 obsoleted 1 changesets
1148 obsoleted 1 changesets
1149 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1149 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1150
1150
1151 Check templates
1151 Check templates
1152 ---------------
1152 ---------------
1153
1153
1154 $ hg tlog
1154 $ hg tlog
1155 @ f897c6137566
1155 @ f897c6137566
1156 |
1156 |
1157 o ea207398892e
1157 o ea207398892e
1158
1158
1159
1159
1160 $ hg fatelog
1160 $ hg fatelog
1161 @ f897c6137566
1161 @ f897c6137566
1162 |
1162 |
1163 o ea207398892e
1163 o ea207398892e
1164
1164
1165
1165
1166 $ hg up -r "desc(B0)" --hidden
1166 $ hg up -r "desc(B0)" --hidden
1167 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1167 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1168 $ hg tlog
1168 $ hg tlog
1169 o f897c6137566
1169 o f897c6137566
1170 | Predecessors: 2:0dec01379d3b
1170 | Predecessors: 2:0dec01379d3b
1171 | semi-colon: 2:0dec01379d3b
1171 | semi-colon: 2:0dec01379d3b
1172 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1172 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1173 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1173 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1174 | @ 0dec01379d3b
1174 | @ 0dec01379d3b
1175 | | Predecessors: 1:471f378eab4c
1175 | | Predecessors: 1:471f378eab4c
1176 | | semi-colon: 1:471f378eab4c
1176 | | semi-colon: 1:471f378eab4c
1177 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1177 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1178 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1178 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1179 | | Successors: 3:f897c6137566; 1:471f378eab4c
1179 | | Successors: 3:f897c6137566; 1:471f378eab4c
1180 | | multi-line: 3:f897c6137566
1180 | | multi-line: 3:f897c6137566
1181 | | multi-line: 1:471f378eab4c
1181 | | multi-line: 1:471f378eab4c
1182 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1182 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1183 | x 471f378eab4c
1183 | x 471f378eab4c
1184 |/ Predecessors: 2:0dec01379d3b
1184 |/ Predecessors: 2:0dec01379d3b
1185 | semi-colon: 2:0dec01379d3b
1185 | semi-colon: 2:0dec01379d3b
1186 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1186 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1187 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1187 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1188 | Successors: 2:0dec01379d3b
1188 | Successors: 2:0dec01379d3b
1189 | multi-line: 2:0dec01379d3b
1189 | multi-line: 2:0dec01379d3b
1190 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1190 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1191 o ea207398892e
1191 o ea207398892e
1192
1192
1193
1193
1194 $ hg fatelog
1194 $ hg fatelog
1195 o f897c6137566
1195 o f897c6137566
1196 |
1196 |
1197 | @ 0dec01379d3b
1197 | @ 0dec01379d3b
1198 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
1198 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
1199 | x 471f378eab4c
1199 | x 471f378eab4c
1200 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1200 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1201 o ea207398892e
1201 o ea207398892e
1202
1202
1203
1203
1204 $ hg up -r "desc(A0)" --hidden
1204 $ hg up -r "desc(A0)" --hidden
1205 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1205 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1206 $ hg tlog
1206 $ hg tlog
1207 o f897c6137566
1207 o f897c6137566
1208 | Predecessors: 1:471f378eab4c
1208 | Predecessors: 1:471f378eab4c
1209 | semi-colon: 1:471f378eab4c
1209 | semi-colon: 1:471f378eab4c
1210 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1210 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1211 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1211 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1212 | @ 471f378eab4c
1212 | @ 471f378eab4c
1213 |/
1213 |/
1214 o ea207398892e
1214 o ea207398892e
1215
1215
1216
1216
1217 $ hg fatelog
1217 $ hg fatelog
1218 o f897c6137566
1218 o f897c6137566
1219 |
1219 |
1220 | @ 471f378eab4c
1220 | @ 471f378eab4c
1221 |/ Obsfate: pruned;
1221 |/ Obsfate: pruned;
1222 o ea207398892e
1222 o ea207398892e
1223
1223
1224
1224
1225 $ hg up -r "desc(ROOT)" --hidden
1225 $ hg up -r "desc(ROOT)" --hidden
1226 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1226 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1227 $ hg tlog
1227 $ hg tlog
1228 o f897c6137566
1228 o f897c6137566
1229 |
1229 |
1230 @ ea207398892e
1230 @ ea207398892e
1231
1231
1232
1232
1233 $ hg fatelog
1233 $ hg fatelog
1234 o f897c6137566
1234 o f897c6137566
1235 |
1235 |
1236 @ ea207398892e
1236 @ ea207398892e
1237
1237
1238
1238
1239 $ hg tlog --hidden
1239 $ hg tlog --hidden
1240 o f897c6137566
1240 o f897c6137566
1241 | Predecessors: 2:0dec01379d3b
1241 | Predecessors: 2:0dec01379d3b
1242 | semi-colon: 2:0dec01379d3b
1242 | semi-colon: 2:0dec01379d3b
1243 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1243 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1244 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1244 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1245 | x 0dec01379d3b
1245 | x 0dec01379d3b
1246 | | Predecessors: 1:471f378eab4c
1246 | | Predecessors: 1:471f378eab4c
1247 | | semi-colon: 1:471f378eab4c
1247 | | semi-colon: 1:471f378eab4c
1248 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1248 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1249 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1249 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1250 | | Successors: 3:f897c6137566; 1:471f378eab4c
1250 | | Successors: 3:f897c6137566; 1:471f378eab4c
1251 | | multi-line: 3:f897c6137566
1251 | | multi-line: 3:f897c6137566
1252 | | multi-line: 1:471f378eab4c
1252 | | multi-line: 1:471f378eab4c
1253 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1253 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1254 | x 471f378eab4c
1254 | x 471f378eab4c
1255 |/ Predecessors: 2:0dec01379d3b
1255 |/ Predecessors: 2:0dec01379d3b
1256 | semi-colon: 2:0dec01379d3b
1256 | semi-colon: 2:0dec01379d3b
1257 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1257 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1258 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1258 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1259 | Successors: 2:0dec01379d3b
1259 | Successors: 2:0dec01379d3b
1260 | multi-line: 2:0dec01379d3b
1260 | multi-line: 2:0dec01379d3b
1261 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1261 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1262 @ ea207398892e
1262 @ ea207398892e
1263
1263
1264 Test template with split + divergence with cycles
1264 Test template with split + divergence with cycles
1265 =================================================
1265 =================================================
1266
1266
1267 $ hg log -G
1267 $ hg log -G
1268 o changeset: 3:f897c6137566
1268 o changeset: 3:f897c6137566
1269 | tag: tip
1269 | tag: tip
1270 | parent: 0:ea207398892e
1270 | parent: 0:ea207398892e
1271 | user: test
1271 | user: test
1272 | date: Thu Jan 01 00:00:00 1970 +0000
1272 | date: Thu Jan 01 00:00:00 1970 +0000
1273 | summary: C0
1273 | summary: C0
1274 |
1274 |
1275 @ changeset: 0:ea207398892e
1275 @ changeset: 0:ea207398892e
1276 user: test
1276 user: test
1277 date: Thu Jan 01 00:00:00 1970 +0000
1277 date: Thu Jan 01 00:00:00 1970 +0000
1278 summary: ROOT
1278 summary: ROOT
1279
1279
1280 $ hg up
1280 $ hg up
1281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1282
1282
1283 Create a commit with three files
1283 Create a commit with three files
1284 $ touch A B C
1284 $ touch A B C
1285 $ hg commit -A -m "Add A,B,C" A B C
1285 $ hg commit -A -m "Add A,B,C" A B C
1286
1286
1287 Split it
1287 Split it
1288 $ hg up 3
1288 $ hg up 3
1289 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1289 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1290 $ touch A
1290 $ touch A
1291 $ hg commit -A -m "Add A,B,C" A
1291 $ hg commit -A -m "Add A,B,C" A
1292 created new head
1292 created new head
1293
1293
1294 $ touch B
1294 $ touch B
1295 $ hg commit -A -m "Add A,B,C" B
1295 $ hg commit -A -m "Add A,B,C" B
1296
1296
1297 $ touch C
1297 $ touch C
1298 $ hg commit -A -m "Add A,B,C" C
1298 $ hg commit -A -m "Add A,B,C" C
1299
1299
1300 $ hg log -G
1300 $ hg log -G
1301 @ changeset: 7:ba2ed02b0c9a
1301 @ changeset: 7:ba2ed02b0c9a
1302 | tag: tip
1302 | tag: tip
1303 | user: test
1303 | user: test
1304 | date: Thu Jan 01 00:00:00 1970 +0000
1304 | date: Thu Jan 01 00:00:00 1970 +0000
1305 | summary: Add A,B,C
1305 | summary: Add A,B,C
1306 |
1306 |
1307 o changeset: 6:4a004186e638
1307 o changeset: 6:4a004186e638
1308 | user: test
1308 | user: test
1309 | date: Thu Jan 01 00:00:00 1970 +0000
1309 | date: Thu Jan 01 00:00:00 1970 +0000
1310 | summary: Add A,B,C
1310 | summary: Add A,B,C
1311 |
1311 |
1312 o changeset: 5:dd800401bd8c
1312 o changeset: 5:dd800401bd8c
1313 | parent: 3:f897c6137566
1313 | parent: 3:f897c6137566
1314 | user: test
1314 | user: test
1315 | date: Thu Jan 01 00:00:00 1970 +0000
1315 | date: Thu Jan 01 00:00:00 1970 +0000
1316 | summary: Add A,B,C
1316 | summary: Add A,B,C
1317 |
1317 |
1318 | o changeset: 4:9bd10a0775e4
1318 | o changeset: 4:9bd10a0775e4
1319 |/ user: test
1319 |/ user: test
1320 | date: Thu Jan 01 00:00:00 1970 +0000
1320 | date: Thu Jan 01 00:00:00 1970 +0000
1321 | summary: Add A,B,C
1321 | summary: Add A,B,C
1322 |
1322 |
1323 o changeset: 3:f897c6137566
1323 o changeset: 3:f897c6137566
1324 | parent: 0:ea207398892e
1324 | parent: 0:ea207398892e
1325 | user: test
1325 | user: test
1326 | date: Thu Jan 01 00:00:00 1970 +0000
1326 | date: Thu Jan 01 00:00:00 1970 +0000
1327 | summary: C0
1327 | summary: C0
1328 |
1328 |
1329 o changeset: 0:ea207398892e
1329 o changeset: 0:ea207398892e
1330 user: test
1330 user: test
1331 date: Thu Jan 01 00:00:00 1970 +0000
1331 date: Thu Jan 01 00:00:00 1970 +0000
1332 summary: ROOT
1332 summary: ROOT
1333
1333
1334 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1334 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1335 obsoleted 1 changesets
1335 obsoleted 1 changesets
1336 $ hg log -G
1336 $ hg log -G
1337 @ changeset: 7:ba2ed02b0c9a
1337 @ changeset: 7:ba2ed02b0c9a
1338 | tag: tip
1338 | tag: tip
1339 | user: test
1339 | user: test
1340 | date: Thu Jan 01 00:00:00 1970 +0000
1340 | date: Thu Jan 01 00:00:00 1970 +0000
1341 | summary: Add A,B,C
1341 | summary: Add A,B,C
1342 |
1342 |
1343 o changeset: 6:4a004186e638
1343 o changeset: 6:4a004186e638
1344 | user: test
1344 | user: test
1345 | date: Thu Jan 01 00:00:00 1970 +0000
1345 | date: Thu Jan 01 00:00:00 1970 +0000
1346 | summary: Add A,B,C
1346 | summary: Add A,B,C
1347 |
1347 |
1348 o changeset: 5:dd800401bd8c
1348 o changeset: 5:dd800401bd8c
1349 | parent: 3:f897c6137566
1349 | parent: 3:f897c6137566
1350 | user: test
1350 | user: test
1351 | date: Thu Jan 01 00:00:00 1970 +0000
1351 | date: Thu Jan 01 00:00:00 1970 +0000
1352 | summary: Add A,B,C
1352 | summary: Add A,B,C
1353 |
1353 |
1354 o changeset: 3:f897c6137566
1354 o changeset: 3:f897c6137566
1355 | parent: 0:ea207398892e
1355 | parent: 0:ea207398892e
1356 | user: test
1356 | user: test
1357 | date: Thu Jan 01 00:00:00 1970 +0000
1357 | date: Thu Jan 01 00:00:00 1970 +0000
1358 | summary: C0
1358 | summary: C0
1359 |
1359 |
1360 o changeset: 0:ea207398892e
1360 o changeset: 0:ea207398892e
1361 user: test
1361 user: test
1362 date: Thu Jan 01 00:00:00 1970 +0000
1362 date: Thu Jan 01 00:00:00 1970 +0000
1363 summary: ROOT
1363 summary: ROOT
1364
1364
1365 Diverge one of the splitted commit
1365 Diverge one of the splitted commit
1366
1366
1367 $ hg up 6
1367 $ hg up 6
1368 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1368 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1369 $ hg commit --amend -m "Add only B"
1369 $ hg commit --amend -m "Add only B"
1370
1370
1371 $ hg up 6 --hidden
1371 $ hg up 6 --hidden
1372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1373 $ hg commit --amend -m "Add B only"
1373 $ hg commit --amend -m "Add B only"
1374
1374
1375 $ hg log -G
1375 $ hg log -G
1376 @ changeset: 9:0b997eb7ceee
1376 @ changeset: 9:0b997eb7ceee
1377 | tag: tip
1377 | tag: tip
1378 | parent: 5:dd800401bd8c
1378 | parent: 5:dd800401bd8c
1379 | user: test
1379 | user: test
1380 | date: Thu Jan 01 00:00:00 1970 +0000
1380 | date: Thu Jan 01 00:00:00 1970 +0000
1381 | instability: content-divergent
1381 | instability: content-divergent
1382 | summary: Add B only
1382 | summary: Add B only
1383 |
1383 |
1384 | o changeset: 8:b18bc8331526
1384 | o changeset: 8:b18bc8331526
1385 |/ parent: 5:dd800401bd8c
1385 |/ parent: 5:dd800401bd8c
1386 | user: test
1386 | user: test
1387 | date: Thu Jan 01 00:00:00 1970 +0000
1387 | date: Thu Jan 01 00:00:00 1970 +0000
1388 | instability: content-divergent
1388 | instability: content-divergent
1389 | summary: Add only B
1389 | summary: Add only B
1390 |
1390 |
1391 | o changeset: 7:ba2ed02b0c9a
1391 | o changeset: 7:ba2ed02b0c9a
1392 | | user: test
1392 | | user: test
1393 | | date: Thu Jan 01 00:00:00 1970 +0000
1393 | | date: Thu Jan 01 00:00:00 1970 +0000
1394 | | instability: orphan, content-divergent
1394 | | instability: orphan, content-divergent
1395 | | summary: Add A,B,C
1395 | | summary: Add A,B,C
1396 | |
1396 | |
1397 | x changeset: 6:4a004186e638
1397 | x changeset: 6:4a004186e638
1398 |/ user: test
1398 |/ user: test
1399 | date: Thu Jan 01 00:00:00 1970 +0000
1399 | date: Thu Jan 01 00:00:00 1970 +0000
1400 | summary: Add A,B,C
1400 | summary: Add A,B,C
1401 |
1401 |
1402 o changeset: 5:dd800401bd8c
1402 o changeset: 5:dd800401bd8c
1403 | parent: 3:f897c6137566
1403 | parent: 3:f897c6137566
1404 | user: test
1404 | user: test
1405 | date: Thu Jan 01 00:00:00 1970 +0000
1405 | date: Thu Jan 01 00:00:00 1970 +0000
1406 | instability: content-divergent
1406 | instability: content-divergent
1407 | summary: Add A,B,C
1407 | summary: Add A,B,C
1408 |
1408 |
1409 o changeset: 3:f897c6137566
1409 o changeset: 3:f897c6137566
1410 | parent: 0:ea207398892e
1410 | parent: 0:ea207398892e
1411 | user: test
1411 | user: test
1412 | date: Thu Jan 01 00:00:00 1970 +0000
1412 | date: Thu Jan 01 00:00:00 1970 +0000
1413 | summary: C0
1413 | summary: C0
1414 |
1414 |
1415 o changeset: 0:ea207398892e
1415 o changeset: 0:ea207398892e
1416 user: test
1416 user: test
1417 date: Thu Jan 01 00:00:00 1970 +0000
1417 date: Thu Jan 01 00:00:00 1970 +0000
1418 summary: ROOT
1418 summary: ROOT
1419
1419
1420
1420
1421 Check templates
1421 Check templates
1422 ---------------
1422 ---------------
1423
1423
1424 $ hg tlog
1424 $ hg tlog
1425 @ 0b997eb7ceee
1425 @ 0b997eb7ceee
1426 | Predecessors: 6:4a004186e638
1426 | Predecessors: 6:4a004186e638
1427 | semi-colon: 6:4a004186e638
1427 | semi-colon: 6:4a004186e638
1428 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1428 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1429 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1429 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1430 | o b18bc8331526
1430 | o b18bc8331526
1431 |/ Predecessors: 6:4a004186e638
1431 |/ Predecessors: 6:4a004186e638
1432 | semi-colon: 6:4a004186e638
1432 | semi-colon: 6:4a004186e638
1433 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1433 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1434 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1434 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1435 | o ba2ed02b0c9a
1435 | o ba2ed02b0c9a
1436 | |
1436 | |
1437 | x 4a004186e638
1437 | x 4a004186e638
1438 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1438 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1439 | multi-line: 8:b18bc8331526
1439 | multi-line: 8:b18bc8331526
1440 | multi-line: 9:0b997eb7ceee
1440 | multi-line: 9:0b997eb7ceee
1441 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1441 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1442 o dd800401bd8c
1442 o dd800401bd8c
1443 |
1443 |
1444 o f897c6137566
1444 o f897c6137566
1445 |
1445 |
1446 o ea207398892e
1446 o ea207398892e
1447
1447
1448 $ hg fatelog
1448 $ hg fatelog
1449 @ 0b997eb7ceee
1449 @ 0b997eb7ceee
1450 |
1450 |
1451 | o b18bc8331526
1451 | o b18bc8331526
1452 |/
1452 |/
1453 | o ba2ed02b0c9a
1453 | o ba2ed02b0c9a
1454 | |
1454 | |
1455 | x 4a004186e638
1455 | x 4a004186e638
1456 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
1456 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
1457 o dd800401bd8c
1457 o dd800401bd8c
1458 |
1458 |
1459 o f897c6137566
1459 o f897c6137566
1460 |
1460 |
1461 o ea207398892e
1461 o ea207398892e
1462
1462
1463 $ hg tlog --hidden
1463 $ hg tlog --hidden
1464 @ 0b997eb7ceee
1464 @ 0b997eb7ceee
1465 | Predecessors: 6:4a004186e638
1465 | Predecessors: 6:4a004186e638
1466 | semi-colon: 6:4a004186e638
1466 | semi-colon: 6:4a004186e638
1467 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1467 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1468 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1468 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1469 | o b18bc8331526
1469 | o b18bc8331526
1470 |/ Predecessors: 6:4a004186e638
1470 |/ Predecessors: 6:4a004186e638
1471 | semi-colon: 6:4a004186e638
1471 | semi-colon: 6:4a004186e638
1472 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1472 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1473 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1473 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1474 | o ba2ed02b0c9a
1474 | o ba2ed02b0c9a
1475 | | Predecessors: 4:9bd10a0775e4
1475 | | Predecessors: 4:9bd10a0775e4
1476 | | semi-colon: 4:9bd10a0775e4
1476 | | semi-colon: 4:9bd10a0775e4
1477 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1477 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1478 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1478 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1479 | x 4a004186e638
1479 | x 4a004186e638
1480 |/ Predecessors: 4:9bd10a0775e4
1480 |/ Predecessors: 4:9bd10a0775e4
1481 | semi-colon: 4:9bd10a0775e4
1481 | semi-colon: 4:9bd10a0775e4
1482 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1482 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1483 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1483 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1484 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1484 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1485 | multi-line: 8:b18bc8331526
1485 | multi-line: 8:b18bc8331526
1486 | multi-line: 9:0b997eb7ceee
1486 | multi-line: 9:0b997eb7ceee
1487 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1487 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1488 o dd800401bd8c
1488 o dd800401bd8c
1489 | Predecessors: 4:9bd10a0775e4
1489 | Predecessors: 4:9bd10a0775e4
1490 | semi-colon: 4:9bd10a0775e4
1490 | semi-colon: 4:9bd10a0775e4
1491 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1491 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1492 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1492 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1493 | x 9bd10a0775e4
1493 | x 9bd10a0775e4
1494 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1494 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1495 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1495 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1496 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
1496 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
1497 o f897c6137566
1497 o f897c6137566
1498 | Predecessors: 2:0dec01379d3b
1498 | Predecessors: 2:0dec01379d3b
1499 | semi-colon: 2:0dec01379d3b
1499 | semi-colon: 2:0dec01379d3b
1500 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1500 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1501 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1501 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1502 | x 0dec01379d3b
1502 | x 0dec01379d3b
1503 | | Predecessors: 1:471f378eab4c
1503 | | Predecessors: 1:471f378eab4c
1504 | | semi-colon: 1:471f378eab4c
1504 | | semi-colon: 1:471f378eab4c
1505 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1505 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1506 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1506 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1507 | | Successors: 3:f897c6137566; 1:471f378eab4c
1507 | | Successors: 3:f897c6137566; 1:471f378eab4c
1508 | | multi-line: 3:f897c6137566
1508 | | multi-line: 3:f897c6137566
1509 | | multi-line: 1:471f378eab4c
1509 | | multi-line: 1:471f378eab4c
1510 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1510 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1511 | x 471f378eab4c
1511 | x 471f378eab4c
1512 |/ Predecessors: 2:0dec01379d3b
1512 |/ Predecessors: 2:0dec01379d3b
1513 | semi-colon: 2:0dec01379d3b
1513 | semi-colon: 2:0dec01379d3b
1514 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1514 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1515 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1515 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1516 | Successors: 2:0dec01379d3b
1516 | Successors: 2:0dec01379d3b
1517 | multi-line: 2:0dec01379d3b
1517 | multi-line: 2:0dec01379d3b
1518 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1518 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1519 o ea207398892e
1519 o ea207398892e
1520
1520
1521 $ hg fatelog --hidden
1521 $ hg fatelog --hidden
1522 @ 0b997eb7ceee
1522 @ 0b997eb7ceee
1523 |
1523 |
1524 | o b18bc8331526
1524 | o b18bc8331526
1525 |/
1525 |/
1526 | o ba2ed02b0c9a
1526 | o ba2ed02b0c9a
1527 | |
1527 | |
1528 | x 4a004186e638
1528 | x 4a004186e638
1529 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
1529 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
1530 o dd800401bd8c
1530 o dd800401bd8c
1531 |
1531 |
1532 | x 9bd10a0775e4
1532 | x 9bd10a0775e4
1533 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
1533 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
1534 o f897c6137566
1534 o f897c6137566
1535 |
1535 |
1536 | x 0dec01379d3b
1536 | x 0dec01379d3b
1537 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
1537 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
1538 | x 471f378eab4c
1538 | x 471f378eab4c
1539 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1539 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1540 o ea207398892e
1540 o ea207398892e
1541
1541
1542 $ hg fatelogjson --hidden
1542 $ hg fatelogjson --hidden
1543 @ 0b997eb7ceee
1543 @ 0b997eb7ceee
1544 |
1544 |
1545 | o b18bc8331526
1545 | o b18bc8331526
1546 |/
1546 |/
1547 | o ba2ed02b0c9a
1547 | o ba2ed02b0c9a
1548 | |
1548 | |
1549 | x 4a004186e638
1549 | x 4a004186e638
1550 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
1550 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
1551 o dd800401bd8c
1551 o dd800401bd8c
1552 |
1552 |
1553 | x 9bd10a0775e4
1553 | x 9bd10a0775e4
1554 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
1554 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
1555 o f897c6137566
1555 o f897c6137566
1556 |
1556 |
1557 | x 0dec01379d3b
1557 | x 0dec01379d3b
1558 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
1558 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
1559 | x 471f378eab4c
1559 | x 471f378eab4c
1560 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
1560 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
1561 o ea207398892e
1561 o ea207398892e
1562
1562
1563 $ hg up --hidden 4
1563 $ hg up --hidden 4
1564 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1564 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1565 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1566 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1566 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1567 $ hg tlog
1567 $ hg tlog
1568 o eceed8f98ffc
1568 o eceed8f98ffc
1569 | Predecessors: 4:9bd10a0775e4
1569 | Predecessors: 4:9bd10a0775e4
1570 | semi-colon: 4:9bd10a0775e4
1570 | semi-colon: 4:9bd10a0775e4
1571 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1571 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1572 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1572 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1573 | o 0b997eb7ceee
1573 | o 0b997eb7ceee
1574 | | Predecessors: 4:9bd10a0775e4
1574 | | Predecessors: 4:9bd10a0775e4
1575 | | semi-colon: 4:9bd10a0775e4
1575 | | semi-colon: 4:9bd10a0775e4
1576 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1576 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1577 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1577 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1578 o | b18bc8331526
1578 o | b18bc8331526
1579 |/ Predecessors: 4:9bd10a0775e4
1579 |/ Predecessors: 4:9bd10a0775e4
1580 | semi-colon: 4:9bd10a0775e4
1580 | semi-colon: 4:9bd10a0775e4
1581 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1581 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1582 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1582 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1583 o dd800401bd8c
1583 o dd800401bd8c
1584 | Predecessors: 4:9bd10a0775e4
1584 | Predecessors: 4:9bd10a0775e4
1585 | semi-colon: 4:9bd10a0775e4
1585 | semi-colon: 4:9bd10a0775e4
1586 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1586 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1587 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1587 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1588 | @ 9bd10a0775e4
1588 | @ 9bd10a0775e4
1589 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1589 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1590 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
1590 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
1591 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1591 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1592 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
1592 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
1593 o f897c6137566
1593 o f897c6137566
1594 |
1594 |
1595 o ea207398892e
1595 o ea207398892e
1596
1596
1597
1597
1598 $ hg fatelog
1598 $ hg fatelog
1599 o eceed8f98ffc
1599 o eceed8f98ffc
1600 |
1600 |
1601 | o 0b997eb7ceee
1601 | o 0b997eb7ceee
1602 | |
1602 | |
1603 o | b18bc8331526
1603 o | b18bc8331526
1604 |/
1604 |/
1605 o dd800401bd8c
1605 o dd800401bd8c
1606 |
1606 |
1607 | @ 9bd10a0775e4
1607 | @ 9bd10a0775e4
1608 |/ Obsfate: split as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
1608 |/ Obsfate: split as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
1609 o f897c6137566
1609 o f897c6137566
1610 |
1610 |
1611 o ea207398892e
1611 o ea207398892e
1612
1612
1613 Test templates with pruned commits
1613 Test templates with pruned commits
1614 ==================================
1614 ==================================
1615
1615
1616 Test setup
1616 Test setup
1617 ----------
1617 ----------
1618
1618
1619 $ hg init $TESTTMP/templates-local-prune
1619 $ hg init $TESTTMP/templates-local-prune
1620 $ cd $TESTTMP/templates-local-prune
1620 $ cd $TESTTMP/templates-local-prune
1621 $ mkcommit ROOT
1621 $ mkcommit ROOT
1622 $ mkcommit A0
1622 $ mkcommit A0
1623 $ hg debugobsolete --record-parent `getid "."`
1623 $ hg debugobsolete --record-parent `getid "."`
1624 obsoleted 1 changesets
1624 obsoleted 1 changesets
1625
1625
1626 Check output
1626 Check output
1627 ------------
1627 ------------
1628
1628
1629 $ hg up "desc(A0)" --hidden
1629 $ hg up "desc(A0)" --hidden
1630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1631 $ hg tlog
1631 $ hg tlog
1632 @ 471f378eab4c
1632 @ 471f378eab4c
1633 |
1633 |
1634 o ea207398892e
1634 o ea207398892e
1635
1635
1636 $ hg fatelog
1636 $ hg fatelog
1637 @ 471f378eab4c
1637 @ 471f378eab4c
1638 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1638 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1639 o ea207398892e
1639 o ea207398892e
1640
1640
1641 $ hg fatelog -v
1641 $ hg fatelog -v
1642 @ 471f378eab4c
1642 @ 471f378eab4c
1643 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1643 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1644 o ea207398892e
1644 o ea207398892e
1645
1645
1646 Test templates with multiple pruned commits
1647 ===========================================
1648
1649 Test setup
1650 ----------
1651
1652 $ hg init $TESTTMP/multiple-local-prune
1653 $ cd $TESTTMP/multiple-local-prune
1654 $ mkcommit ROOT
1655 $ mkcommit A0
1656 $ hg commit --amend -m "A1"
1657 $ hg debugobsolete --record-parent `getid "."`
1658 obsoleted 1 changesets
1659
1660 $ hg up -r "desc(A0)" --hidden
1661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1662 $ hg commit --amend -m "A2"
1663 $ hg debugobsolete --record-parent `getid "."`
1664 obsoleted 1 changesets
1665
1666 Check output
1667 ------------
1668
1669 $ hg up "desc(A0)" --hidden
1670 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1671 $ hg tlog
1672 @ 471f378eab4c
1673 |
1674 o ea207398892e
1675
1676 # todo: the obsfate output is not ideal
1677 $ hg fatelog
1678 @ 471f378eab4c
1679 | Obsfate: pruned;
1680 o ea207398892e
1681
1682 $ hg fatelog -v --hidden
1683 x 65b757b745b9
1684 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1685 | x fdf9bde5129a
1686 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1687 | @ 471f378eab4c
1688 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
1689 o ea207398892e
1690
1691
1692 Test templates with splitted and pruned commit
1693 ==============================================
1694
1695 $ hg init $TESTTMP/templates-local-split-prune
1696 $ cd $TESTTMP/templates-local-split-prune
1697 $ mkcommit ROOT
1698 $ echo 42 >> a
1699 $ echo 43 >> b
1700 $ hg commit -A -m "A0"
1701 adding a
1702 adding b
1703 $ hg log --hidden -G
1704 @ changeset: 1:471597cad322
1705 | tag: tip
1706 | user: test
1707 | date: Thu Jan 01 00:00:00 1970 +0000
1708 | summary: A0
1709 |
1710 o changeset: 0:ea207398892e
1711 user: test
1712 date: Thu Jan 01 00:00:00 1970 +0000
1713 summary: ROOT
1714
1715 # Simulate split
1716 $ hg up -r "desc(ROOT)"
1717 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1718 $ echo 42 >> a
1719 $ hg commit -A -m "A1"
1720 adding a
1721 created new head
1722 $ echo 43 >> b
1723 $ hg commit -A -m "A2"
1724 adding b
1725 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
1726 obsoleted 1 changesets
1727
1728 # Simulate prune
1729 $ hg debugobsolete --record-parent `getid "."`
1730 obsoleted 1 changesets
1731
1732 $ hg log --hidden -G
1733 @ changeset: 3:0d0ef4bdf70e
1734 | tag: tip
1735 | user: test
1736 | date: Thu Jan 01 00:00:00 1970 +0000
1737 | summary: A2
1738 |
1739 o changeset: 2:617adc3a144c
1740 | parent: 0:ea207398892e
1741 | user: test
1742 | date: Thu Jan 01 00:00:00 1970 +0000
1743 | summary: A1
1744 |
1745 | x changeset: 1:471597cad322
1746 |/ user: test
1747 | date: Thu Jan 01 00:00:00 1970 +0000
1748 | summary: A0
1749 |
1750 o changeset: 0:ea207398892e
1751 user: test
1752 date: Thu Jan 01 00:00:00 1970 +0000
1753 summary: ROOT
1754
1755 Check templates
1756 ---------------
1757
1758 $ hg up 'desc("A0")' --hidden
1759 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1760
1761 # todo: the obsfate output is not ideal
1762 $ hg fatelog
1763 o 617adc3a144c
1764 |
1765 | @ 471597cad322
1766 |/ Obsfate: pruned;
1767 o ea207398892e
1768
1769 $ hg up -r 'desc("A2")' --hidden
1770 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1771
1772 $ hg fatelog --hidden
1773 @ 0d0ef4bdf70e
1774 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1775 o 617adc3a144c
1776 |
1777 | x 471597cad322
1778 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
1779 o ea207398892e
1780
General Comments 0
You need to be logged in to leave comments. Login now