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