Mercurial > evolve

comparison tests/test-topic-stack.t @ 2919:5b514ab2ab4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stack: properly order stack when gaps existing inside it We transitively search for the next "stack" ancestors, of changeset in the stack not based on other revision of the stack. This should help having a consistent display when topic are interleaved.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 09 Sep 2017 22:32:50 +0530
parents 0437158e0ed6
children 01cf426bd458
comparison
equal deleted inserted replaced
2918:0437158e0ed6 2919:5b514ab2ab4e
530 o 1 default {} public c_b 530 o 1 default {} public c_b
531 | 531 |
532 o 0 default {} public c_a 532 o 0 default {} public c_a
533 533
534 XXX: The following should show single heads 534 XXX: The following should show single heads
535 XXX: The behind count is weird, because the topic are interleaved.
536
535 $ hg stack 537 $ hg stack
536 ### topic: foobar (2 heads) 538 ### topic: foobar
537 ### branch: default, 3 behind 539 ### branch: default, 3 behind
538 t2: c_D 540 t2@ c_e (current)
539 ^ c_c 541 ^ c_h
540 t1@ c_e (current) 542 t1: c_D
541 t0^ c_h (base) 543 t0^ c_c (base)
542 544
543 $ hg stack foo 545 $ hg stack foo
544 ### topic: foo (3 heads) 546 ### topic: foo
545 ### branch: default, ambigious rebase destination 547 ### branch: default, ambigious rebase destination
546 t4: c_c 548 t4: c_f
547 ^ c_b 549 ^ c_e
548 t3: c_h 550 t3: c_h
549 t2: c_g 551 t2: c_g
550 ^ c_D 552 ^ c_D
551 t1: c_f 553 t1: c_c
552 t0^ c_e (base) 554 t0^ c_b (base)
553 555
554 case involving a merge 556 case involving a merge
555 ---------------------- 557 ----------------------
556 558
557 $ cd .. 559 $ cd ..
616 | 618 |
617 o 0 default {} draft c_A 619 o 0 default {} draft c_A
618 620
619 621
620 $ hg stack red 622 $ hg stack red
621 ### topic: red (3 heads) 623 ### topic: red
622 ### branch: default, 6 behind 624 ### branch: default, 6 behind
623 t5: c_C 625 t5: c_H
624 t2^ c_B (base)
625 t4: c_F
626 t3: c_E
627 t2: c_B
628 ^ c_A
629 t1: c_H
630 ^ c_G 626 ^ c_G
631 ^ c_D 627 ^ c_D
632 t0^ c_D (base) 628 t4: c_C
629 t1^ c_B (base)
630 t3: c_F
631 t2: c_E
632 t1: c_B
633 t0^ c_A (base)
633 $ hg stack blue 634 $ hg stack blue
634 ### topic: blue (3 heads) 635 ### topic: blue
635 ### branch: default, ambigious rebase destination 636 ### branch: default, ambigious rebase destination
636 t3: c_D 637 t3@ c_I (current)
638 ^ c_H
639 t2: c_D
637 ^ c_C 640 ^ c_C
638 t2: c_G 641 t1: c_G
639 ^ c_F 642 t0^ c_F (base)
640 t1@ c_I (current)
641 t0^ c_H (base)
642 643
643 Even with some obsolete and orphan changesets 644 Even with some obsolete and orphan changesets
644 645
645 (the ordering of each branch of "blue" change because their hash change. we 646 (the ordering of each branch of "blue" change because their hash change. we
646 should stabilize this eventuelly) 647 should stabilize this eventuelly)
682 |/ 683 |/
683 o 0 default {} draft c_A 684 o 0 default {} draft c_A
684 685
685 686
686 $ hg stack red 687 $ hg stack red
687 ### topic: red (3 heads) 688 ### topic: red
688 ### branch: default, ambigious rebase destination 689 ### branch: default, ambigious rebase destination
689 t5$ c_H (unstable) 690 t5$ c_H (unstable)
690 ^ c_G 691 ^ c_G
691 ^ c_D 692 ^ c_D
692 t4$ c_C (unstable) 693 t4$ c_C (unstable)
694 t3$ c_F (unstable) 695 t3$ c_F (unstable)
695 t2$ c_E (unstable) 696 t2$ c_E (unstable)
696 t1: c_B 697 t1: c_B
697 t0^ c_A (base) 698 t0^ c_A (base)
698 $ hg stack blue 699 $ hg stack blue
699 ### topic: blue (3 heads) 700 ### topic: blue
700 ### branch: default, ambigious rebase destination 701 ### branch: default, ambigious rebase destination
701 t3$ c_G (unstable) 702 t3$ c_I (unstable)
703 ^ c_H
704 t2$ c_G (unstable)
702 ^ c_F 705 ^ c_F
703 t2$ c_I (unstable)
704 ^ c_H
705 t1$ c_D (current unstable) 706 t1$ c_D (current unstable)
706 t0^ c_C (base) 707 t0^ c_C (base)
707 708
708 more obsolescence 709 more obsolescence
709 710
756 |/ 757 |/
757 o 0 default {} draft c_A 758 o 0 default {} draft c_A
758 759
759 760
760 $ hg stack red 761 $ hg stack red
761 ### topic: red (3 heads) 762 ### topic: red
762 ### branch: default, ambigious rebase destination 763 ### branch: default, ambigious rebase destination
763 t5$ c_H (unstable) 764 t5$ c_H (unstable)
764 ^ c_G 765 ^ c_G
765 ^ c_D 766 ^ c_D
766 t4$ c_F (unstable) 767 t4$ c_F (unstable)
768 t1^ c_B (base) 769 t1^ c_B (base)
769 t2$ c_C (unstable) 770 t2$ c_C (unstable)
770 t1: c_B 771 t1: c_B
771 t0^ c_A (base) 772 t0^ c_A (base)
772 $ hg stack blue 773 $ hg stack blue
773 ### topic: blue (3 heads) 774 ### topic: blue
774 ### branch: default, ambigious rebase destination 775 ### branch: default, ambigious rebase destination
775 t3$ c_I (unstable) 776 t3$ c_I (unstable)
776 ^ c_H 777 ^ c_H
777 t2$ c_G (unstable) 778 t2$ c_G (unstable)
778 ^ c_F 779 ^ c_F