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