comparison tests/test-evolve-templates.t @ 2498:b765650b37ee

template: skip "successors" in test output when empty This should clarify the test output a bit.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 May 2017 17:13:21 +0200
parents 1e9b86ed78c9
children 8abc7066e384
comparison
equal deleted inserted replaced
2497:1e9b86ed78c9 2498:b765650b37ee
12 > [extensions] 12 > [extensions]
13 > evolve = 13 > evolve =
14 > [alias] 14 > [alias]
15 > tlog = log -G -T '{node|short}\ 15 > tlog = log -G -T '{node|short}\
16 > {if(precursors, "\n Precursors: {precursors}")}\ 16 > {if(precursors, "\n Precursors: {precursors}")}\
17 > \n Successors: {successors}\ 17 > {if(successors, "\n Successors: {successors}")}\
18 > \n Fate: {obsfate_quiet}\n' 18 > \n Fate: {obsfate_quiet}\n'
19 > EOF 19 > EOF
20 20
21 Test templates on amended commit 21 Test templates on amended commit
22 ================================ 22 ================================
69 69
70 Precursors template should show current revision as it is the working copy 70 Precursors template should show current revision as it is the working copy
71 $ hg tlog 71 $ hg tlog
72 o d004c8f274b9 72 o d004c8f274b9
73 | Precursors: 471f378eab4c 73 | Precursors: 471f378eab4c
74 | Successors:
75 | Fate: 74 | Fate:
76 | @ 471f378eab4c 75 | @ 471f378eab4c
77 |/ Successors: [d004c8f274b9] 76 |/ Successors: [d004c8f274b9]
78 | Fate: superseed as d004c8f274b9 77 | Fate: superseed as d004c8f274b9
79 o ea207398892e 78 o ea207398892e
80 Successors:
81 Fate: 79 Fate:
82 $ hg up 'desc(A1)' --hidden 80 $ hg up 'desc(A1)' --hidden
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 working directory parent is obsolete! (a468dc9b3633) 82 working directory parent is obsolete! (a468dc9b3633)
85 (use 'hg evolve' to update to its successor: d004c8f274b9) 83 (use 'hg evolve' to update to its successor: d004c8f274b9)
86 84
87 Precursors template should show current revision as it is the working copy 85 Precursors template should show current revision as it is the working copy
88 $ hg tlog 86 $ hg tlog
89 o d004c8f274b9 87 o d004c8f274b9
90 | Precursors: a468dc9b3633 88 | Precursors: a468dc9b3633
91 | Successors:
92 | Fate: 89 | Fate:
93 | @ a468dc9b3633 90 | @ a468dc9b3633
94 |/ Successors: [d004c8f274b9] 91 |/ Successors: [d004c8f274b9]
95 | Fate: superseed as d004c8f274b9 92 | Fate: superseed as d004c8f274b9
96 o ea207398892e 93 o ea207398892e
97 Successors:
98 Fate: 94 Fate:
99 Precursors template should show the precursor as we force its display with 95 Precursors template should show the precursor as we force its display with
100 --hidden 96 --hidden
101 $ hg tlog --hidden 97 $ hg tlog --hidden
102 o d004c8f274b9 98 o d004c8f274b9
103 | Precursors: a468dc9b3633 99 | Precursors: a468dc9b3633
104 | Successors:
105 | Fate: 100 | Fate:
106 | @ a468dc9b3633 101 | @ a468dc9b3633
107 |/ Precursors: 471f378eab4c 102 |/ Precursors: 471f378eab4c
108 | Successors: [d004c8f274b9] 103 | Successors: [d004c8f274b9]
109 | Fate: superseed as d004c8f274b9 104 | Fate: superseed as d004c8f274b9
110 | x f137d23bb3e1 105 | x f137d23bb3e1
111 | | Successors:
112 | | Fate: pruned 106 | | Fate: pruned
113 | x 471f378eab4c 107 | x 471f378eab4c
114 |/ Successors: [a468dc9b3633] 108 |/ Successors: [a468dc9b3633]
115 | Fate: superseed as a468dc9b3633 109 | Fate: superseed as a468dc9b3633
116 o ea207398892e 110 o ea207398892e
117 Successors:
118 Fate: 111 Fate:
119 112
120 $ hg up 'desc(A2)' 113 $ hg up 'desc(A2)'
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 114 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
122 $ hg tlog 115 $ hg tlog
123 @ d004c8f274b9 116 @ d004c8f274b9
124 | Successors: 117 | Fate:
125 | Fate: 118 o ea207398892e
126 o ea207398892e
127 Successors:
128 Fate: 119 Fate:
129 $ hg tlog --hidden 120 $ hg tlog --hidden
130 @ d004c8f274b9 121 @ d004c8f274b9
131 | Precursors: a468dc9b3633 122 | Precursors: a468dc9b3633
132 | Successors:
133 | Fate: 123 | Fate:
134 | x a468dc9b3633 124 | x a468dc9b3633
135 |/ Precursors: 471f378eab4c 125 |/ Precursors: 471f378eab4c
136 | Successors: [d004c8f274b9] 126 | Successors: [d004c8f274b9]
137 | Fate: superseed as d004c8f274b9 127 | Fate: superseed as d004c8f274b9
138 | x f137d23bb3e1 128 | x f137d23bb3e1
139 | | Successors:
140 | | Fate: pruned 129 | | Fate: pruned
141 | x 471f378eab4c 130 | x 471f378eab4c
142 |/ Successors: [a468dc9b3633] 131 |/ Successors: [a468dc9b3633]
143 | Fate: superseed as a468dc9b3633 132 | Fate: superseed as a468dc9b3633
144 o ea207398892e 133 o ea207398892e
145 Successors:
146 Fate: 134 Fate:
147 135
148 Test templates with splitted commit 136 Test templates with splitted commit
149 =================================== 137 ===================================
150 138
237 225
238 Precursors template should show current revision as it is the working copy 226 Precursors template should show current revision as it is the working copy
239 $ hg tlog 227 $ hg tlog
240 o f257fde29c7a 228 o f257fde29c7a
241 | Precursors: 471597cad322 229 | Precursors: 471597cad322
242 | Successors:
243 | Fate: 230 | Fate:
244 o 337fec4d2edc 231 o 337fec4d2edc
245 | Precursors: 471597cad322 232 | Precursors: 471597cad322
246 | Successors:
247 | Fate: 233 | Fate:
248 | @ 471597cad322 234 | @ 471597cad322
249 |/ Successors: [337fec4d2edc, f257fde29c7a] 235 |/ Successors: [337fec4d2edc, f257fde29c7a]
250 | Fate: superseed as 337fec4d2edc,f257fde29c7a 236 | Fate: superseed as 337fec4d2edc,f257fde29c7a
251 o ea207398892e 237 o ea207398892e
252 Successors:
253 Fate: 238 Fate:
254 $ hg up f257fde29c7a 239 $ hg up f257fde29c7a
255 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 240 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
256 241
257 Precursors template should not show a precursor as it's not displayed in the 242 Precursors template should not show a precursor as it's not displayed in the
258 log 243 log
259 $ hg tlog 244 $ hg tlog
260 @ f257fde29c7a 245 @ f257fde29c7a
261 | Successors:
262 | Fate: 246 | Fate:
263 o 337fec4d2edc 247 o 337fec4d2edc
264 | Successors: 248 | Fate:
265 | Fate: 249 o ea207398892e
266 o ea207398892e
267 Successors:
268 Fate: 250 Fate:
269 Precursors template should show the precursor as we force its display with 251 Precursors template should show the precursor as we force its display with
270 --hidden 252 --hidden
271 $ hg tlog --hidden 253 $ hg tlog --hidden
272 @ f257fde29c7a 254 @ f257fde29c7a
273 | Precursors: 471597cad322 255 | Precursors: 471597cad322
274 | Successors:
275 | Fate: 256 | Fate:
276 o 337fec4d2edc 257 o 337fec4d2edc
277 | Precursors: 471597cad322 258 | Precursors: 471597cad322
278 | Successors:
279 | Fate: 259 | Fate:
280 | x 471597cad322 260 | x 471597cad322
281 |/ Successors: [337fec4d2edc, f257fde29c7a] 261 |/ Successors: [337fec4d2edc, f257fde29c7a]
282 | Fate: superseed as 337fec4d2edc,f257fde29c7a 262 | Fate: superseed as 337fec4d2edc,f257fde29c7a
283 o ea207398892e 263 o ea207398892e
284 Successors:
285 Fate: 264 Fate:
286 Test templates with folded commit 265 Test templates with folded commit
287 ============================== 266 ==============================
288 267
289 Test setup 268 Test setup
347 326
348 Precursors template should show current revision as it is the working copy 327 Precursors template should show current revision as it is the working copy
349 $ hg tlog 328 $ hg tlog
350 o eb5a0daa2192 329 o eb5a0daa2192
351 | Precursors: 471f378eab4c 330 | Precursors: 471f378eab4c
352 | Successors:
353 | Fate: 331 | Fate:
354 | @ 471f378eab4c 332 | @ 471f378eab4c
355 |/ Successors: [eb5a0daa2192] 333 |/ Successors: [eb5a0daa2192]
356 | Fate: superseed as eb5a0daa2192 334 | Fate: superseed as eb5a0daa2192
357 o ea207398892e 335 o ea207398892e
358 Successors:
359 Fate: 336 Fate:
360 $ hg up 'desc(B0)' --hidden 337 $ hg up 'desc(B0)' --hidden
361 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 338 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
362 working directory parent is obsolete! (0dec01379d3b) 339 working directory parent is obsolete! (0dec01379d3b)
363 (use 'hg evolve' to update to its successor: eb5a0daa2192) 340 (use 'hg evolve' to update to its successor: eb5a0daa2192)
365 Precursors template should show both precursors as they should be both 342 Precursors template should show both precursors as they should be both
366 displayed 343 displayed
367 $ hg tlog 344 $ hg tlog
368 o eb5a0daa2192 345 o eb5a0daa2192
369 | Precursors: 0dec01379d3b, 471f378eab4c 346 | Precursors: 0dec01379d3b, 471f378eab4c
370 | Successors:
371 | Fate: 347 | Fate:
372 | @ 0dec01379d3b 348 | @ 0dec01379d3b
373 | | Successors: [eb5a0daa2192] 349 | | Successors: [eb5a0daa2192]
374 | | Fate: superseed as eb5a0daa2192 350 | | Fate: superseed as eb5a0daa2192
375 | x 471f378eab4c 351 | x 471f378eab4c
376 |/ Successors: [eb5a0daa2192] 352 |/ Successors: [eb5a0daa2192]
377 | Fate: superseed as eb5a0daa2192 353 | Fate: superseed as eb5a0daa2192
378 o ea207398892e 354 o ea207398892e
379 Successors:
380 Fate: 355 Fate:
381 $ hg up 'desc(C0)' 356 $ hg up 'desc(C0)'
382 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 357 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
383 358
384 Precursors template should not show precursors as it's not displayed in the 359 Precursors template should not show precursors as it's not displayed in the
385 log 360 log
386 $ hg tlog 361 $ hg tlog
387 @ eb5a0daa2192 362 @ eb5a0daa2192
388 | Successors: 363 | Fate:
389 | Fate: 364 o ea207398892e
390 o ea207398892e
391 Successors:
392 Fate: 365 Fate:
393 Precursors template should show both precursors as we force its display with 366 Precursors template should show both precursors as we force its display with
394 --hidden 367 --hidden
395 $ hg tlog --hidden 368 $ hg tlog --hidden
396 @ eb5a0daa2192 369 @ eb5a0daa2192
397 | Precursors: 0dec01379d3b, 471f378eab4c 370 | Precursors: 0dec01379d3b, 471f378eab4c
398 | Successors:
399 | Fate: 371 | Fate:
400 | x 0dec01379d3b 372 | x 0dec01379d3b
401 | | Successors: [eb5a0daa2192] 373 | | Successors: [eb5a0daa2192]
402 | | Fate: superseed as eb5a0daa2192 374 | | Fate: superseed as eb5a0daa2192
403 | x 471f378eab4c 375 | x 471f378eab4c
404 |/ Successors: [eb5a0daa2192] 376 |/ Successors: [eb5a0daa2192]
405 | Fate: superseed as eb5a0daa2192 377 | Fate: superseed as eb5a0daa2192
406 o ea207398892e 378 o ea207398892e
407 Successors:
408 Fate: 379 Fate:
409 380
410 Test templates with divergence 381 Test templates with divergence
411 ============================== 382 ==============================
412 383
480 451
481 Precursors template should show current revision as it is the working copy 452 Precursors template should show current revision as it is the working copy
482 $ hg tlog 453 $ hg tlog
483 o 019fadeab383 454 o 019fadeab383
484 | Precursors: 471f378eab4c 455 | Precursors: 471f378eab4c
485 | Successors:
486 | Fate: 456 | Fate:
487 | o fdf9bde5129a 457 | o fdf9bde5129a
488 |/ Precursors: 471f378eab4c 458 |/ Precursors: 471f378eab4c
489 | Successors:
490 | Fate: 459 | Fate:
491 | @ 471f378eab4c 460 | @ 471f378eab4c
492 |/ Successors: [fdf9bde5129a], [019fadeab383] 461 |/ Successors: [fdf9bde5129a], [019fadeab383]
493 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 462 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
494 o ea207398892e 463 o ea207398892e
495 Successors:
496 Fate: 464 Fate:
497 $ hg up 'desc(A1)' 465 $ hg up 'desc(A1)'
498 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 466 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
499 Precursors template should not show precursors as it's not displayed in the 467 Precursors template should not show precursors as it's not displayed in the
500 log 468 log
501 $ hg tlog 469 $ hg tlog
502 o 019fadeab383 470 o 019fadeab383
503 | Successors:
504 | Fate: 471 | Fate:
505 | @ fdf9bde5129a 472 | @ fdf9bde5129a
506 |/ Successors: 473 |/ Fate:
507 | Fate: 474 o ea207398892e
508 o ea207398892e
509 Successors:
510 Fate: 475 Fate:
511 Precursors template should a precursor as we force its display with --hidden 476 Precursors template should a precursor as we force its display with --hidden
512 $ hg tlog --hidden 477 $ hg tlog --hidden
513 o 019fadeab383 478 o 019fadeab383
514 | Precursors: 65b757b745b9 479 | Precursors: 65b757b745b9
515 | Successors:
516 | Fate: 480 | Fate:
517 | x 65b757b745b9 481 | x 65b757b745b9
518 |/ Precursors: 471f378eab4c 482 |/ Precursors: 471f378eab4c
519 | Successors: [019fadeab383] 483 | Successors: [019fadeab383]
520 | Fate: superseed as 019fadeab383 484 | Fate: superseed as 019fadeab383
521 | @ fdf9bde5129a 485 | @ fdf9bde5129a
522 |/ Precursors: 471f378eab4c 486 |/ Precursors: 471f378eab4c
523 | Successors:
524 | Fate: 487 | Fate:
525 | x 471f378eab4c 488 | x 471f378eab4c
526 |/ Successors: [fdf9bde5129a], [65b757b745b9] 489 |/ Successors: [fdf9bde5129a], [65b757b745b9]
527 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 490 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9
528 o ea207398892e 491 o ea207398892e
529 Successors:
530 Fate: 492 Fate:
531 Test templates with amended + folded commit 493 Test templates with amended + folded commit
532 =========================================== 494 ===========================================
533 495
534 Test setup 496 Test setup
603 working directory parent is obsolete! (471f378eab4c) 565 working directory parent is obsolete! (471f378eab4c)
604 (use 'hg evolve' to update to its successor: eb5a0daa2192) 566 (use 'hg evolve' to update to its successor: eb5a0daa2192)
605 $ hg tlog 567 $ hg tlog
606 o eb5a0daa2192 568 o eb5a0daa2192
607 | Precursors: 471f378eab4c 569 | Precursors: 471f378eab4c
608 | Successors:
609 | Fate: 570 | Fate:
610 | @ 471f378eab4c 571 | @ 471f378eab4c
611 |/ Successors: [eb5a0daa2192] 572 |/ Successors: [eb5a0daa2192]
612 | Fate: superseed as eb5a0daa2192 573 | Fate: superseed as eb5a0daa2192
613 o ea207398892e 574 o ea207398892e
614 Successors:
615 Fate: 575 Fate:
616 $ hg up 'desc(B0)' --hidden 576 $ hg up 'desc(B0)' --hidden
617 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 577 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
618 working directory parent is obsolete! (0dec01379d3b) 578 working directory parent is obsolete! (0dec01379d3b)
619 (use 'hg evolve' to update to its successor: eb5a0daa2192) 579 (use 'hg evolve' to update to its successor: eb5a0daa2192)
620 $ hg tlog 580 $ hg tlog
621 o eb5a0daa2192 581 o eb5a0daa2192
622 | Precursors: 0dec01379d3b, 471f378eab4c 582 | Precursors: 0dec01379d3b, 471f378eab4c
623 | Successors:
624 | Fate: 583 | Fate:
625 | @ 0dec01379d3b 584 | @ 0dec01379d3b
626 | | Successors: [eb5a0daa2192] 585 | | Successors: [eb5a0daa2192]
627 | | Fate: superseed as eb5a0daa2192 586 | | Fate: superseed as eb5a0daa2192
628 | x 471f378eab4c 587 | x 471f378eab4c
629 |/ Successors: [eb5a0daa2192] 588 |/ Successors: [eb5a0daa2192]
630 | Fate: superseed as eb5a0daa2192 589 | Fate: superseed as eb5a0daa2192
631 o ea207398892e 590 o ea207398892e
632 Successors:
633 Fate: 591 Fate:
634 $ hg up 'desc(B1)' --hidden 592 $ hg up 'desc(B1)' --hidden
635 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 593 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
636 working directory parent is obsolete! (b7ea6d14e664) 594 working directory parent is obsolete! (b7ea6d14e664)
637 (use 'hg evolve' to update to its successor: eb5a0daa2192) 595 (use 'hg evolve' to update to its successor: eb5a0daa2192)
638 $ hg tlog 596 $ hg tlog
639 o eb5a0daa2192 597 o eb5a0daa2192
640 | Precursors: 471f378eab4c, b7ea6d14e664 598 | Precursors: 471f378eab4c, b7ea6d14e664
641 | Successors:
642 | Fate: 599 | Fate:
643 | @ b7ea6d14e664 600 | @ b7ea6d14e664
644 | | Successors: [eb5a0daa2192] 601 | | Successors: [eb5a0daa2192]
645 | | Fate: superseed as eb5a0daa2192 602 | | Fate: superseed as eb5a0daa2192
646 | x 471f378eab4c 603 | x 471f378eab4c
647 |/ Successors: [eb5a0daa2192] 604 |/ Successors: [eb5a0daa2192]
648 | Fate: superseed as eb5a0daa2192 605 | Fate: superseed as eb5a0daa2192
649 o ea207398892e 606 o ea207398892e
650 Successors:
651 Fate: 607 Fate:
652 $ hg up 'desc(C0)' 608 $ hg up 'desc(C0)'
653 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 609 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
654 $ hg tlog 610 $ hg tlog
655 @ eb5a0daa2192 611 @ eb5a0daa2192
656 | Successors: 612 | Fate:
657 | Fate: 613 o ea207398892e
658 o ea207398892e
659 Successors:
660 Fate: 614 Fate:
661 $ hg tlog --hidden 615 $ hg tlog --hidden
662 @ eb5a0daa2192 616 @ eb5a0daa2192
663 | Precursors: 471f378eab4c, b7ea6d14e664 617 | Precursors: 471f378eab4c, b7ea6d14e664
664 | Successors:
665 | Fate: 618 | Fate:
666 | x b7ea6d14e664 619 | x b7ea6d14e664
667 | | Precursors: 0dec01379d3b 620 | | Precursors: 0dec01379d3b
668 | | Successors: [eb5a0daa2192] 621 | | Successors: [eb5a0daa2192]
669 | | Fate: superseed as eb5a0daa2192 622 | | Fate: superseed as eb5a0daa2192
672 | | Fate: superseed as b7ea6d14e664 625 | | Fate: superseed as b7ea6d14e664
673 | x 471f378eab4c 626 | x 471f378eab4c
674 |/ Successors: [eb5a0daa2192] 627 |/ Successors: [eb5a0daa2192]
675 | Fate: superseed as eb5a0daa2192 628 | Fate: superseed as eb5a0daa2192
676 o ea207398892e 629 o ea207398892e
677 Successors:
678 Fate: 630 Fate:
679 631
680 Test template with pushed and pulled obs markers 632 Test template with pushed and pulled obs markers
681 ============================================== 633 ==============================================
682 634
765 --------------- 717 ---------------
766 718
767 $ hg tlog 719 $ hg tlog
768 o 7a230b46bf61 720 o 7a230b46bf61
769 | Precursors: 471f378eab4c 721 | Precursors: 471f378eab4c
770 | Successors:
771 | Fate: 722 | Fate:
772 | @ 471f378eab4c 723 | @ 471f378eab4c
773 |/ Successors: [7a230b46bf61] 724 |/ Successors: [7a230b46bf61]
774 | Fate: superseed as 7a230b46bf61 725 | Fate: superseed as 7a230b46bf61
775 o ea207398892e 726 o ea207398892e
776 Successors:
777 Fate: 727 Fate:
778 $ hg up 'desc(A2)' 728 $ hg up 'desc(A2)'
779 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 729 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
780 $ hg tlog 730 $ hg tlog
781 @ 7a230b46bf61 731 @ 7a230b46bf61
782 | Successors: 732 | Fate:
783 | Fate: 733 o ea207398892e
784 o ea207398892e
785 Successors:
786 Fate: 734 Fate:
787 $ hg tlog --hidden 735 $ hg tlog --hidden
788 @ 7a230b46bf61 736 @ 7a230b46bf61
789 | Precursors: 471f378eab4c 737 | Precursors: 471f378eab4c
790 | Successors:
791 | Fate: 738 | Fate:
792 | x 471f378eab4c 739 | x 471f378eab4c
793 |/ Successors: [7a230b46bf61] 740 |/ Successors: [7a230b46bf61]
794 | Fate: superseed as 7a230b46bf61 741 | Fate: superseed as 7a230b46bf61
795 o ea207398892e 742 o ea207398892e
796 Successors: 743 Fate:
797 Fate: