##// END OF EJS Templates
test-revert: make sure all 'tracked' files are really tracked...
Martin von Zweigbergk -
r23161:6f31f46b default
parent child Browse files
Show More
@@ -452,7 +452,7 b' Write the python script to disk'
452 > 'wc': (True, lambda cc: 'content3'),
452 > 'wc': (True, lambda cc: 'content3'),
453 > # deleted: file is recorded as tracked but missing
453 > # deleted: file is recorded as tracked but missing
454 > # rely on file deletion outside of this script
454 > # rely on file deletion outside of this script
455 > 'deleted': (True, lambda cc:'TOBEDELETED'),
455 > 'deleted': (True, lambda cc: None),
456 > }
456 > }
457 > # untracked-X is a version of X where the file is not tracked (? unknown)
457 > # untracked-X is a version of X where the file is not tracked (? unknown)
458 > wccontent['untracked-clean'] = (False, wccontent['clean'][1])
458 > wccontent['untracked-clean'] = (False, wccontent['clean'][1])
@@ -472,7 +472,7 b' Write the python script to disk'
472 > if not parent and 'deleted' in wckey:
472 > if not parent and 'deleted' in wckey:
473 > continue
473 > continue
474 > def statestring(content):
474 > def statestring(content):
475 > return content in (None, 'TOBEDELETED') and 'missing' or content
475 > return content is None and 'missing' or content
476 > wcc = wcfunc(ctxvalue)
476 > wcc = wcfunc(ctxvalue)
477 > trackedstring = tracked and 'tracked' or 'untracked'
477 > trackedstring = tracked and 'tracked' or 'untracked'
478 > filename = "%s_%s_%s-%s" % (statestring(base),
478 > filename = "%s_%s_%s-%s" % (statestring(base),
@@ -497,7 +497,9 b' Write the python script to disk'
497 > elif target == 'parent':
497 > elif target == 'parent':
498 > content.append((filename, parent))
498 > content.append((filename, parent))
499 > elif target == 'wc':
499 > elif target == 'wc':
500 > content.append((filename, wcc))
500 > # Make sure there is content so the file gets written and can be
501 > # tracked. It will be deleted outside of this script.
502 > content.append((filename, wcc or 'TOBEDELETED'))
501 > else:
503 > else:
502 > print >> sys.stderr, "unknown target:", target
504 > print >> sys.stderr, "unknown target:", target
503 > sys.exit(1)
505 > sys.exit(1)
@@ -711,8 +713,12 b' Setup working directory'
711 adding content1_missing_content1-untracked
713 adding content1_missing_content1-untracked
712 adding content1_missing_content3-tracked
714 adding content1_missing_content3-tracked
713 adding content1_missing_content3-untracked
715 adding content1_missing_content3-untracked
716 adding content1_missing_missing-tracked
717 adding content1_missing_missing-untracked
714 adding missing_missing_content3-tracked
718 adding missing_missing_content3-tracked
715 adding missing_missing_content3-untracked
719 adding missing_missing_content3-untracked
720 adding missing_missing_missing-tracked
721 adding missing_missing_missing-untracked
716 $ hg forget *_*_*-untracked
722 $ hg forget *_*_*-untracked
717 $ rm *_*_missing-*
723 $ rm *_*_missing-*
718 $ hg status
724 $ hg status
@@ -735,7 +741,9 b' Setup working directory'
735 R missing_content2_missing-untracked
741 R missing_content2_missing-untracked
736 ! content1_content1_missing-tracked
742 ! content1_content1_missing-tracked
737 ! content1_content2_missing-tracked
743 ! content1_content2_missing-tracked
744 ! content1_missing_missing-tracked
738 ! missing_content2_missing-tracked
745 ! missing_content2_missing-tracked
746 ! missing_missing_missing-tracked
739 ? content1_missing_content1-untracked
747 ? content1_missing_content1-untracked
740 ? content1_missing_content3-untracked
748 ? content1_missing_content3-untracked
741 ? missing_missing_content3-untracked
749 ? missing_missing_content3-untracked
@@ -761,7 +769,9 b' Setup working directory'
761 R content1_missing_missing-untracked
769 R content1_missing_missing-untracked
762 ! content1_content1_missing-tracked
770 ! content1_content1_missing-tracked
763 ! content1_content2_missing-tracked
771 ! content1_content2_missing-tracked
772 ! content1_missing_missing-tracked
764 ! missing_content2_missing-tracked
773 ! missing_content2_missing-tracked
774 ! missing_missing_missing-tracked
765 ? missing_missing_content3-untracked
775 ? missing_missing_content3-untracked
766
776
767 (create a simple text version of the content)
777 (create a simple text version of the content)
@@ -816,12 +826,14 b' check revert output'
816 undeleting content1_content2_missing-untracked
826 undeleting content1_content2_missing-untracked
817 forgetting content1_missing_content1-tracked
827 forgetting content1_missing_content1-tracked
818 forgetting content1_missing_content3-tracked
828 forgetting content1_missing_content3-tracked
829 forgetting content1_missing_missing-tracked
819 undeleting missing_content2_content2-untracked
830 undeleting missing_content2_content2-untracked
820 reverting missing_content2_content3-tracked
831 reverting missing_content2_content3-tracked
821 undeleting missing_content2_content3-untracked
832 undeleting missing_content2_content3-untracked
822 reverting missing_content2_missing-tracked
833 reverting missing_content2_missing-tracked
823 undeleting missing_content2_missing-untracked
834 undeleting missing_content2_missing-untracked
824 forgetting missing_missing_content3-tracked
835 forgetting missing_missing_content3-tracked
836 forgetting missing_missing_missing-tracked
825
837
826 Compare resulting directory with revert target.
838 Compare resulting directory with revert target.
827
839
@@ -872,12 +884,13 b' check revert output'
872 adding content1_missing_content1-untracked
884 adding content1_missing_content1-untracked
873 reverting content1_missing_content3-tracked
885 reverting content1_missing_content3-tracked
874 adding content1_missing_content3-untracked
886 adding content1_missing_content3-untracked
875 adding content1_missing_missing-tracked
887 reverting content1_missing_missing-tracked
876 adding content1_missing_missing-untracked
888 adding content1_missing_missing-untracked
877 removing missing_content2_content2-tracked
889 removing missing_content2_content2-tracked
878 removing missing_content2_content3-tracked
890 removing missing_content2_content3-tracked
879 removing missing_content2_missing-tracked
891 removing missing_content2_missing-tracked
880 forgetting missing_missing_content3-tracked
892 forgetting missing_missing_content3-tracked
893 forgetting missing_missing_missing-tracked
881
894
882 Compare resulting directory with revert target.
895 Compare resulting directory with revert target.
883
896
@@ -957,7 +970,6 b' revert all files individually and check '
957 file not managed: content1_missing_content3-untracked
970 file not managed: content1_missing_content3-untracked
958
971
959 ### revert for: content1_missing_missing-tracked
972 ### revert for: content1_missing_missing-tracked
960 content1_missing_missing-tracked: no such file in rev * (glob)
961
973
962 ### revert for: content1_missing_missing-untracked
974 ### revert for: content1_missing_missing-untracked
963 content1_missing_missing-untracked: no such file in rev * (glob)
975 content1_missing_missing-untracked: no such file in rev * (glob)
@@ -981,7 +993,6 b' revert all files individually and check '
981 file not managed: missing_missing_content3-untracked
993 file not managed: missing_missing_content3-untracked
982
994
983 ### revert for: missing_missing_missing-tracked
995 ### revert for: missing_missing_missing-tracked
984 missing_missing_missing-tracked: no such file in rev * (glob)
985
996
986 ### revert for: missing_missing_missing-untracked
997 ### revert for: missing_missing_missing-untracked
987 missing_missing_missing-untracked: no such file in rev * (glob)
998 missing_missing_missing-untracked: no such file in rev * (glob)
@@ -1075,7 +1086,6 b' revert all files individually and check '
1075 file not managed: missing_missing_content3-untracked
1086 file not managed: missing_missing_content3-untracked
1076
1087
1077 ### revert for: missing_missing_missing-tracked
1088 ### revert for: missing_missing_missing-tracked
1078 missing_missing_missing-tracked: no such file in rev * (glob)
1079
1089
1080 ### revert for: missing_missing_missing-untracked
1090 ### revert for: missing_missing_missing-untracked
1081 missing_missing_missing-untracked: no such file in rev * (glob)
1091 missing_missing_missing-untracked: no such file in rev * (glob)
General Comments 0
You need to be logged in to leave comments. Login now