##// END OF EJS Templates
test-revert: add case where the file is marked as removed in the wc...
Pierre-Yves David -
r22140:74e93204 default
parent child Browse files
Show More
@@ -455,6 +455,8 b' Write the python script to disk'
455 455 > 'revert': lambda cc: cc[0],
456 456 > # wc: file exist with a content different from base and parent
457 457 > 'wc': lambda cc: 'wc',
458 > # removed: file is missing and marked as untracked
459 > 'removed': lambda cc: None,
458 460 > }
459 461 >
460 462 > # build the combination of possible states
@@ -500,18 +502,23 b' check list of planned files'
500 502
501 503 $ python gen-revert-cases.py filelist
502 504 added_clean
505 added_removed
503 506 added_revert
504 507 added_wc
505 508 clean_clean
509 clean_removed
506 510 clean_revert
507 511 clean_wc
508 512 missing_clean
513 missing_removed
509 514 missing_revert
510 515 missing_wc
511 516 modified_clean
517 modified_removed
512 518 modified_revert
513 519 modified_wc
514 520 removed_clean
521 removed_removed
515 522 removed_revert
516 523 removed_wc
517 524
@@ -541,22 +548,28 b' Generate base changeset'
541 548 $ python ../gen-revert-cases.py base
542 549 $ hg addremove --similarity 0
543 550 adding clean_clean
551 adding clean_removed
544 552 adding clean_revert
545 553 adding clean_wc
546 554 adding modified_clean
555 adding modified_removed
547 556 adding modified_revert
548 557 adding modified_wc
549 558 adding removed_clean
559 adding removed_removed
550 560 adding removed_revert
551 561 adding removed_wc
552 562 $ hg status
553 563 A clean_clean
564 A clean_removed
554 565 A clean_revert
555 566 A clean_wc
556 567 A modified_clean
568 A modified_removed
557 569 A modified_revert
558 570 A modified_wc
559 571 A removed_clean
572 A removed_removed
560 573 A removed_revert
561 574 A removed_wc
562 575 $ hg commit -m 'base'
@@ -566,12 +579,15 b' Generate base changeset'
566 579 $ python ../dircontent.py > ../content-base.txt
567 580 $ cat ../content-base.txt
568 581 base clean_clean
582 base clean_removed
569 583 base clean_revert
570 584 base clean_wc
571 585 base modified_clean
586 base modified_removed
572 587 base modified_revert
573 588 base modified_wc
574 589 base removed_clean
590 base removed_removed
575 591 base removed_revert
576 592 base removed_wc
577 593
@@ -580,19 +596,24 b' Create parent changeset'
580 596 $ python ../gen-revert-cases.py parent
581 597 $ hg addremove --similarity 0
582 598 adding added_clean
599 adding added_removed
583 600 adding added_revert
584 601 adding added_wc
585 602 removing removed_clean
603 removing removed_removed
586 604 removing removed_revert
587 605 removing removed_wc
588 606 $ hg status
589 607 M modified_clean
608 M modified_removed
590 609 M modified_revert
591 610 M modified_wc
592 611 A added_clean
612 A added_removed
593 613 A added_revert
594 614 A added_wc
595 615 R removed_clean
616 R removed_removed
596 617 R removed_revert
597 618 R removed_wc
598 619 $ hg commit -m 'parent'
@@ -602,12 +623,15 b' Create parent changeset'
602 623 $ python ../dircontent.py > ../content-parent.txt
603 624 $ cat ../content-parent.txt
604 625 parent added_clean
626 parent added_removed
605 627 parent added_revert
606 628 parent added_wc
607 629 base clean_clean
630 base clean_removed
608 631 base clean_revert
609 632 base clean_wc
610 633 parent modified_clean
634 parent modified_removed
611 635 parent modified_revert
612 636 parent modified_wc
613 637
@@ -615,8 +639,11 b' Setup working directory'
615 639
616 640 $ python ../gen-revert-cases.py wc | cat
617 641 $ hg addremove --similarity 0
642 removing added_removed
618 643 removing added_revert
644 removing clean_removed
619 645 adding missing_wc
646 removing modified_removed
620 647 adding removed_revert
621 648 adding removed_wc
622 649 $ hg status
@@ -627,7 +654,10 b' Setup working directory'
627 654 A missing_wc
628 655 A removed_revert
629 656 A removed_wc
657 R added_removed
630 658 R added_revert
659 R clean_removed
660 R modified_removed
631 661
632 662 $ hg status --rev 'desc("base")'
633 663 M clean_wc
@@ -637,7 +667,10 b' Setup working directory'
637 667 A added_clean
638 668 A added_wc
639 669 A missing_wc
670 R clean_removed
671 R modified_removed
640 672 R removed_clean
673 R removed_removed
641 674
642 675 (create a simple text version of the content)
643 676
@@ -668,10 +701,13 b' Test revert --all to parent content'
668 701 check revert output
669 702
670 703 $ hg revert --all
704 undeleting added_removed
671 705 undeleting added_revert
672 706 reverting added_wc
707 undeleting clean_removed
673 708 reverting clean_wc
674 709 forgetting missing_wc
710 undeleting modified_removed
675 711 reverting modified_revert
676 712 reverting modified_wc
677 713 forgetting removed_revert
@@ -713,12 +749,15 b' Misbehavior:'
713 749 $ hg revert --all --rev 'desc(base)'
714 750 removing added_clean
715 751 removing added_wc
752 undeleting clean_removed
716 753 reverting clean_wc
717 754 forgetting missing_wc
718 755 reverting modified_clean
756 undeleting modified_removed
719 757 reverting modified_revert
720 758 reverting modified_wc
721 759 adding removed_clean
760 adding removed_removed
722 761 reverting removed_revert
723 762 reverting removed_wc
724 763
@@ -759,6 +798,8 b' revert all files individually and check '
759 798 ### revert for: added_clean
760 799 no changes needed to added_clean
761 800
801 ### revert for: added_removed
802
762 803 ### revert for: added_revert
763 804
764 805 ### revert for: added_wc
@@ -766,6 +807,8 b' revert all files individually and check '
766 807 ### revert for: clean_clean
767 808 no changes needed to clean_clean
768 809
810 ### revert for: clean_removed
811
769 812 ### revert for: clean_revert
770 813 no changes needed to clean_revert
771 814
@@ -774,6 +817,9 b' revert all files individually and check '
774 817 ### revert for: missing_clean
775 818 missing_clean: no such file in rev * (glob)
776 819
820 ### revert for: missing_removed
821 missing_removed: no such file in rev * (glob)
822
777 823 ### revert for: missing_revert
778 824 missing_revert: no such file in rev * (glob)
779 825
@@ -782,6 +828,8 b' revert all files individually and check '
782 828 ### revert for: modified_clean
783 829 no changes needed to modified_clean
784 830
831 ### revert for: modified_removed
832
785 833 ### revert for: modified_revert
786 834
787 835 ### revert for: modified_wc
@@ -789,6 +837,9 b' revert all files individually and check '
789 837 ### revert for: removed_clean
790 838 removed_clean: no such file in rev * (glob)
791 839
840 ### revert for: removed_removed
841 removed_removed: no such file in rev * (glob)
842
792 843 ### revert for: removed_revert
793 844
794 845 ### revert for: removed_wc
@@ -822,6 +873,7 b' Misbehavior:'
822 873 | - clean_revert
823 874 | - modified_revert
824 875 | - removed_revert
876 | - added_removed
825 877
826 878 $ for file in `python ../gen-revert-cases.py filelist`; do
827 879 > echo '### revert for:' $file;
@@ -830,12 +882,16 b' Misbehavior:'
830 882 > done
831 883 ### revert for: added_clean
832 884
885 ### revert for: added_removed
886
833 887 ### revert for: added_revert
834 888
835 889 ### revert for: added_wc
836 890
837 891 ### revert for: clean_clean
838 892
893 ### revert for: clean_removed
894
839 895 ### revert for: clean_revert
840 896
841 897 ### revert for: clean_wc
@@ -843,6 +899,9 b' Misbehavior:'
843 899 ### revert for: missing_clean
844 900 missing_clean: no such file in rev * (glob)
845 901
902 ### revert for: missing_removed
903 missing_removed: no such file in rev * (glob)
904
846 905 ### revert for: missing_revert
847 906 missing_revert: no such file in rev * (glob)
848 907
@@ -850,12 +909,16 b' Misbehavior:'
850 909
851 910 ### revert for: modified_clean
852 911
912 ### revert for: modified_removed
913
853 914 ### revert for: modified_revert
854 915
855 916 ### revert for: modified_wc
856 917
857 918 ### revert for: removed_clean
858 919
920 ### revert for: removed_removed
921
859 922 ### revert for: removed_revert
860 923
861 924 ### revert for: removed_wc
General Comments 0
You need to be logged in to leave comments. Login now