Mercurial > evolve

comparison tests/test-evolve-templates.t @ 2490:94f171534918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
template: update obsfate to be more human friendly Approach the obslog output for the moment.
author Boris Feld <boris.feld@octobus.net>
date Fri, 26 May 2017 19:21:36 +0200
parents 84a8219a2f9a
children e2b6b978f38f
comparison
equal deleted inserted replaced
2489:84a8219a2f9a 2490:94f171534918
66 66
67 Precursors template should show current revision as it is the working copy 67 Precursors template should show current revision as it is the working copy
68 $ hg tlog 68 $ hg tlog
69 o d004c8f274b9 Precursors: 471f378eab4c | Successors: | Fate: 69 o d004c8f274b9 Precursors: 471f378eab4c | Successors: | Fate:
70 | 70 |
71 | @ 471f378eab4c Precursors: | Successors: [d004c8f274b9] | Fate: superseed 71 | @ 471f378eab4c Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9
72 |/ 72 |/
73 o ea207398892e Precursors: | Successors: | Fate: 73 o ea207398892e Precursors: | Successors: | Fate:
74 74
75 $ hg up 'desc(A1)' --hidden 75 $ hg up 'desc(A1)' --hidden
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 79
80 Precursors template should show current revision as it is the working copy 80 Precursors template should show current revision as it is the working copy
81 $ hg tlog 81 $ hg tlog
82 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: 82 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
83 | 83 |
84 | @ a468dc9b3633 Precursors: | Successors: [d004c8f274b9] | Fate: superseed 84 | @ a468dc9b3633 Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9
85 |/ 85 |/
86 o ea207398892e Precursors: | Successors: | Fate: 86 o ea207398892e Precursors: | Successors: | Fate:
87 87
88 Precursors template should show the precursor as we force its display with 88 Precursors template should show the precursor as we force its display with
89 --hidden 89 --hidden
90 $ hg tlog --hidden 90 $ hg tlog --hidden
91 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: 91 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
92 | 92 |
93 | @ a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed 93 | @ a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9
94 |/ 94 |/
95 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned 95 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned
96 | | 96 | |
97 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed 97 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as d004c8f274b9
98 |/ 98 |/
99 o ea207398892e Precursors: | Successors: | Fate: 99 o ea207398892e Precursors: | Successors: | Fate:
100 100
101 101
102 $ hg up 'desc(A2)' 102 $ hg up 'desc(A2)'
107 o ea207398892e Precursors: | Successors: | Fate: 107 o ea207398892e Precursors: | Successors: | Fate:
108 108
109 $ hg tlog --hidden 109 $ hg tlog --hidden
110 @ d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: 110 @ d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
111 | 111 |
112 | x a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed 112 | x a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9
113 |/ 113 |/
114 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned 114 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned
115 | | 115 | |
116 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed 116 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as d004c8f274b9
117 |/ 117 |/
118 o ea207398892e Precursors: | Successors: | Fate: 118 o ea207398892e Precursors: | Successors: | Fate:
119 119
120 120
121 Test templates with splitted commit 121 Test templates with splitted commit
212 $ hg tlog 212 $ hg tlog
213 o f257fde29c7a Precursors: 471597cad322 | Successors: | Fate: 213 o f257fde29c7a Precursors: 471597cad322 | Successors: | Fate:
214 | 214 |
215 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate: 215 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate:
216 | 216 |
217 | @ 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed_split 217 | @ 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a
218 |/ 218 |/
219 o ea207398892e Precursors: | Successors: | Fate: 219 o ea207398892e Precursors: | Successors: | Fate:
220 220
221 $ hg up f257fde29c7a 221 $ hg up f257fde29c7a
222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
235 $ hg tlog --hidden 235 $ hg tlog --hidden
236 @ f257fde29c7a Precursors: 471597cad322 | Successors: | Fate: 236 @ f257fde29c7a Precursors: 471597cad322 | Successors: | Fate:
237 | 237 |
238 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate: 238 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate:
239 | 239 |
240 | x 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed_split 240 | x 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a
241 |/ 241 |/
242 o ea207398892e Precursors: | Successors: | Fate: 242 o ea207398892e Precursors: | Successors: | Fate:
243 243
244 Test templates with folded commit 244 Test templates with folded commit
245 ============================== 245 ==============================
305 305
306 Precursors template should show current revision as it is the working copy 306 Precursors template should show current revision as it is the working copy
307 $ hg tlog 307 $ hg tlog
308 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: 308 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate:
309 | 309 |
310 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 310 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
311 |/ 311 |/
312 o ea207398892e Precursors: | Successors: | Fate: 312 o ea207398892e Precursors: | Successors: | Fate:
313 313
314 $ hg up 'desc(B0)' --hidden 314 $ hg up 'desc(B0)' --hidden
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
319 Precursors template should show both precursors as they should be both 319 Precursors template should show both precursors as they should be both
320 displayed 320 displayed
321 $ hg tlog 321 $ hg tlog
322 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: 322 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
323 | 323 |
324 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 324 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
325 | | 325 | |
326 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 326 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
327 |/ 327 |/
328 o ea207398892e Precursors: | Successors: | Fate: 328 o ea207398892e Precursors: | Successors: | Fate:
329 329
330 $ hg up 'desc(C0)' 330 $ hg up 'desc(C0)'
331 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 331 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340 Precursors template should show both precursors as we force its display with 340 Precursors template should show both precursors as we force its display with
341 --hidden 341 --hidden
342 $ hg tlog --hidden 342 $ hg tlog --hidden
343 @ eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: 343 @ eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
344 | 344 |
345 | x 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 345 | x 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
346 | | 346 | |
347 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 347 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
348 |/ 348 |/
349 o ea207398892e Precursors: | Successors: | Fate: 349 o ea207398892e Precursors: | Successors: | Fate:
350 350
351 351
352 Test templates with divergence 352 Test templates with divergence
424 $ hg tlog 424 $ hg tlog
425 o 019fadeab383 Precursors: 471f378eab4c | Successors: | Fate: 425 o 019fadeab383 Precursors: 471f378eab4c | Successors: | Fate:
426 | 426 |
427 | o fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: 427 | o fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate:
428 |/ 428 |/
429 | @ 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [019fadeab383] | Fate: diverged 429 | @ 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [019fadeab383] | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
430 |/ 430 |/
431 o ea207398892e Precursors: | Successors: | Fate: 431 o ea207398892e Precursors: | Successors: | Fate:
432 432
433 $ hg up 'desc(A1)' 433 $ hg up 'desc(A1)'
434 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 434 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
443 443
444 Precursors template should a precursor as we force its display with --hidden 444 Precursors template should a precursor as we force its display with --hidden
445 $ hg tlog --hidden 445 $ hg tlog --hidden
446 o 019fadeab383 Precursors: 65b757b745b9 | Successors: | Fate: 446 o 019fadeab383 Precursors: 65b757b745b9 | Successors: | Fate:
447 | 447 |
448 | x 65b757b745b9 Precursors: 471f378eab4c | Successors: [019fadeab383] | Fate: superseed 448 | x 65b757b745b9 Precursors: 471f378eab4c | Successors: [019fadeab383] | Fate: superseed as 019fadeab383
449 |/ 449 |/
450 | @ fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: 450 | @ fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate:
451 |/ 451 |/
452 | x 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [65b757b745b9] | Fate: diverged 452 | x 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [65b757b745b9] | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
453 |/ 453 |/
454 o ea207398892e Precursors: | Successors: | Fate: 454 o ea207398892e Precursors: | Successors: | Fate:
455 455
456 Test templates with amended + folded commit 456 Test templates with amended + folded commit
457 =========================================== 457 ===========================================
528 working directory parent is obsolete! (471f378eab4c) 528 working directory parent is obsolete! (471f378eab4c)
529 (use 'hg evolve' to update to its successor: eb5a0daa2192) 529 (use 'hg evolve' to update to its successor: eb5a0daa2192)
530 $ hg tlog 530 $ hg tlog
531 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: 531 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate:
532 | 532 |
533 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 533 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
534 |/ 534 |/
535 o ea207398892e Precursors: | Successors: | Fate: 535 o ea207398892e Precursors: | Successors: | Fate:
536 536
537 $ hg up 'desc(B0)' --hidden 537 $ hg up 'desc(B0)' --hidden
538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
539 working directory parent is obsolete! (0dec01379d3b) 539 working directory parent is obsolete! (0dec01379d3b)
540 (use 'hg evolve' to update to its successor: eb5a0daa2192) 540 (use 'hg evolve' to update to its successor: eb5a0daa2192)
541 $ hg tlog 541 $ hg tlog
542 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: 542 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
543 | 543 |
544 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 544 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
545 | | 545 | |
546 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 546 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
547 |/ 547 |/
548 o ea207398892e Precursors: | Successors: | Fate: 548 o ea207398892e Precursors: | Successors: | Fate:
549 549
550 $ hg up 'desc(B1)' --hidden 550 $ hg up 'desc(B1)' --hidden
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
552 working directory parent is obsolete! (b7ea6d14e664) 552 working directory parent is obsolete! (b7ea6d14e664)
553 (use 'hg evolve' to update to its successor: eb5a0daa2192) 553 (use 'hg evolve' to update to its successor: eb5a0daa2192)
554 $ hg tlog 554 $ hg tlog
555 o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: 555 o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate:
556 | 556 |
557 | @ b7ea6d14e664 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 557 | @ b7ea6d14e664 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
558 | | 558 | |
559 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 559 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
560 |/ 560 |/
561 o ea207398892e Precursors: | Successors: | Fate: 561 o ea207398892e Precursors: | Successors: | Fate:
562 562
563 $ hg up 'desc(C0)' 563 $ hg up 'desc(C0)'
564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
568 o ea207398892e Precursors: | Successors: | Fate: 568 o ea207398892e Precursors: | Successors: | Fate:
569 569
570 $ hg tlog --hidden 570 $ hg tlog --hidden
571 @ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: 571 @ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate:
572 | 572 |
573 | x b7ea6d14e664 Precursors: 0dec01379d3b | Successors: [eb5a0daa2192] | Fate: superseed 573 | x b7ea6d14e664 Precursors: 0dec01379d3b | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
574 | | 574 | |
575 | | x 0dec01379d3b Precursors: | Successors: [b7ea6d14e664] | Fate: superseed 575 | | x 0dec01379d3b Precursors: | Successors: [b7ea6d14e664] | Fate: superseed as eb5a0daa2192
576 | |/ 576 | |/
577 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed 577 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192
578 |/ 578 |/
579 o ea207398892e Precursors: | Successors: | Fate: 579 o ea207398892e Precursors: | Successors: | Fate:
580 580
581 581
582 Test template with pushed and pulled obs markers 582 Test template with pushed and pulled obs markers
667 --------------- 667 ---------------
668 668
669 $ hg tlog 669 $ hg tlog
670 o 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: 670 o 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate:
671 | 671 |
672 | @ 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed 672 | @ 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61
673 |/ 673 |/
674 o ea207398892e Precursors: | Successors: | Fate: 674 o ea207398892e Precursors: | Successors: | Fate:
675 675
676 $ hg up 'desc(A2)' 676 $ hg up 'desc(A2)'
677 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 677 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
681 o ea207398892e Precursors: | Successors: | Fate: 681 o ea207398892e Precursors: | Successors: | Fate:
682 682
683 $ hg tlog --hidden 683 $ hg tlog --hidden
684 @ 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: 684 @ 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate:
685 | 685 |
686 | x 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed 686 | x 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61
687 |/ 687 |/
688 o ea207398892e Precursors: | Successors: | Fate: 688 o ea207398892e Precursors: | Successors: | Fate:
689 689