3 # Copyright (c) 2022 Omar Polo <op@openbsd.org>
5 # Permission to use, copy, modify, and distribute this software for any
6 # purpose with or without fee is hereby granted, provided that the above
7 # copyright notice and this permission notice appear in all copies.
9 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 test_patch_simple_add_file() {
20 local testroot=`test_init patch_simple_add_file`
22 got checkout $testroot/repo $testroot/wt > /dev/null
24 if [ $ret -ne 0 ]; then
25 test_done $testroot $ret
29 cat <<EOF > $testroot/wt/patch
36 (cd $testroot/wt && got patch patch) > $testroot/stdout
38 if [ $ret -ne 0 ]; then
39 test_done $testroot $ret
43 echo "A eta" > $testroot/stdout.expected
44 cmp -s $testroot/stdout.expected $testroot/stdout
46 if [ $ret -ne 0 ]; then
47 diff -u $testroot/stdout.expected $testroot/stdout
48 test_done $testroot $ret
52 echo eta > $testroot/wt/eta.expected
53 cmp -s $testroot/wt/eta.expected $testroot/wt/eta
55 if [ $ret -ne 0 ]; then
56 diff -u $testroot/wt/eta.expected $testroot/wt/eta
58 test_done $testroot $ret
61 test_patch_simple_rm_file() {
62 local testroot=`test_init patch_simple_rm_file`
64 got checkout $testroot/repo $testroot/wt > /dev/null
66 if [ $ret -ne 0 ]; then
67 test_done $testroot $ret
71 cat <<EOF > $testroot/wt/patch
78 echo "D alpha" > $testroot/stdout.expected
80 (cd $testroot/wt && got patch patch) > $testroot/stdout
82 if [ $ret -ne 0 ]; then
83 test_done $testroot $ret
87 cmp -s $testroot/stdout.expected $testroot/stdout
89 if [ $ret -ne 0 ]; then
90 diff -u $testroot/stdout.expected $testroot/stdout
91 test_done $testroot $ret
95 if [ -f $testroot/wt/alpha ]; then
97 echo "alpha still exists!"
99 test_done $testroot $ret
102 test_patch_simple_edit_file() {
103 local testroot=`test_init patch_simple_edit_file`
105 got checkout $testroot/repo $testroot/wt > /dev/null
107 if [ $ret -ne 0 ]; then
108 test_done $testroot $ret
112 cat <<EOF > $testroot/wt/patch
117 +alpha is my favourite character
120 echo "M alpha" > $testroot/stdout.expected
122 (cd $testroot/wt && got patch patch) > $testroot/stdout
124 if [ $ret -ne 0 ]; then
125 test_done $testroot $ret
129 cmp -s $testroot/stdout.expected $testroot/stdout
131 if [ $ret -ne 0 ]; then
132 diff -u $testroot/stdout.expected $testroot/stdout
133 test_done $testroot $ret
137 echo 'alpha is my favourite character' > $testroot/wt/alpha.expected
138 cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
140 if [ $ret -ne 0 ]; then
141 diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
143 test_done $testroot $ret
146 test_patch_prepend_line() {
147 local testroot=`test_init patch_prepend_line`
149 got checkout $testroot/repo $testroot/wt > /dev/null
151 if [ $ret -ne 0 ]; then
152 test_done $testroot $ret
156 cat <<EOF > $testroot/wt/patch
164 echo "M alpha" > $testroot/stdout.expected
166 (cd $testroot/wt && got patch patch) > $testroot/stdout
168 if [ $ret -ne 0 ]; then
169 test_done $testroot $ret
173 cmp -s $testroot/stdout.expected $testroot/stdout
175 if [ $ret -ne 0 ]; then
176 diff -u $testroot/stdout.expected $testroot/stdout
177 test_done $testroot $ret
181 echo hatsuseno > $testroot/wt/alpha.expected
182 echo alpha >> $testroot/wt/alpha.expected
183 cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
185 if [ $ret -ne 0 ]; then
186 diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
188 test_done $testroot $ret
191 test_patch_replace_line() {
192 local testroot=`test_init patch_replace_line`
194 got checkout $testroot/repo $testroot/wt > /dev/null
196 if [ $ret -ne 0 ]; then
197 test_done $testroot $ret
201 jot 10 > $testroot/wt/numbers
202 (cd $testroot/wt/ && got add numbers && got ci -m 'add numbers') \
205 if [ $ret -ne 0 ]; then
206 test_done $testroot $ret
210 cat <<EOF > $testroot/wt/patch
224 echo "M numbers" > $testroot/stdout.expected
226 (cd $testroot/wt && got patch patch) > $testroot/stdout
228 if [ $ret -ne 0 ]; then
229 test_done $testroot $ret
233 cmp -s $testroot/stdout.expected $testroot/stdout
235 if [ $ret -ne 0 ]; then
236 diff -u $testroot/stdout.expected $testroot/stdout
237 test_done $testroot $ret
241 jot 10 | sed 's/6/foo/' > $testroot/wt/numbers.expected
242 cmp -s $testroot/wt/numbers.expected $testroot/wt/numbers
244 if [ $ret -ne 0 ]; then
245 diff -u $testroot/wt/numbers.expected $testroot/wt/numbers
247 test_done $testroot $ret
250 test_patch_multiple_hunks() {
251 local testroot=`test_init patch_replace_multiple_hunks`
253 got checkout $testroot/repo $testroot/wt > /dev/null
255 if [ $ret -ne 0 ]; then
256 test_done $testroot $ret
260 jot 100 > $testroot/wt/numbers
261 (cd $testroot/wt/ && got add numbers && got ci -m 'add numbers') \
264 if [ $ret -ne 0 ]; then
265 test_done $testroot $ret
269 cat <<EOF > $testroot/wt/patch
299 echo "M numbers" > $testroot/stdout.expected
301 (cd $testroot/wt && got patch patch) > $testroot/stdout
303 if [ $ret -ne 0 ]; then
304 test_done $testroot $ret
308 cmp -s $testroot/stdout.expected $testroot/stdout
310 if [ $ret -ne 0 ]; then
311 diff -u $testroot/stdout.expected $testroot/stdout
312 test_done $testroot $ret
316 jot 100 | sed -e 's/^6$/foo/' -e 's/^60$/foo foo/' \
317 > $testroot/wt/numbers.expected
318 echo "101" >> $testroot/wt/numbers.expected
319 echo "102" >> $testroot/wt/numbers.expected
320 echo "..." >> $testroot/wt/numbers.expected
322 cmp -s $testroot/wt/numbers.expected $testroot/wt/numbers
324 if [ $ret -ne 0 ]; then
325 diff -u $testroot/wt/numbers.expected $testroot/wt/numbers
327 test_done $testroot $ret
330 test_patch_multiple_files() {
331 local testroot=`test_init patch_multiple_files`
333 got checkout $testroot/repo $testroot/wt > /dev/null
335 if [ $ret -ne 0 ]; then
336 test_done $testroot $ret
340 cat <<EOF > $testroot/wt/patch
341 --- alpha Mon Mar 7 19:02:07 2022
342 +++ alpha Mon Mar 7 19:01:53 2022
347 --- beta Mon Mar 7 19:02:11 2022
348 +++ beta Mon Mar 7 19:01:46 2022
353 --- gamma/delta Mon Mar 7 19:02:17 2022
354 +++ gamma/delta Mon Mar 7 19:01:37 2022
360 echo "M alpha" > $testroot/stdout.expected
361 echo "M beta" >> $testroot/stdout.expected
362 echo "M gamma/delta" >> $testroot/stdout.expected
364 (cd $testroot/wt && got patch patch) > $testroot/stdout
366 if [ $ret -ne 0 ]; then
367 test_done $testroot $ret
371 cmp -s $testroot/stdout.expected $testroot/stdout
373 if [ $ret -ne 0 ]; then
374 diff -u $testroot/stdout.expected $testroot/stdout
375 test_done $testroot $ret
379 printf 'new\nalpha\navailable\n' > $testroot/wt/alpha.expected
380 printf 'beta\nwas\nimproved\n' > $testroot/wt/beta.expected
381 printf 'delta new\n' > $testroot/wt/gamma/delta.expected
383 for f in alpha beta gamma/delta; do
384 cmp -s $testroot/wt/$f.expected $testroot/wt/$f
386 if [ $ret -ne 0 ]; then
387 diff -u $testroot/wt/$f.expected $testroot/wt/$f
388 test_done $testroot $ret
393 test_done $testroot 0
396 test_patch_dont_apply() {
397 local testroot=`test_init patch_dont_apply`
399 got checkout $testroot/repo $testroot/wt > /dev/null
401 if [ $ret -ne 0 ]; then
402 test_done $testroot $ret
406 jot 100 > $testroot/wt/numbers
407 (cd $testroot/wt && got add numbers && got commit -m 'add numbers') \
410 if [ $ret -ne 0 ]; then
411 test_done $testroot $ret
415 cat <<EOF > $testroot/wt/patch
435 (cd $testroot/wt && got patch patch) > $testroot/stdout 2> /dev/null
437 if [ $ret -eq 0 ]; then # should fail
438 test_done $testroot 1
442 cat <<EOF > $testroot/stdout.expected
444 @@ -1,1 +1,2 @@ hunk failed to apply
446 @@ -1,9 +0,0 @@ hunk failed to apply
449 cmp -s $testroot/stdout.expected $testroot/stdout
451 if [ $ret -ne 0 ]; then
452 diff -u $testroot/stdout.expected $testroot/stdout
454 test_done $testroot $ret
457 test_patch_malformed() {
458 local testroot=`test_init patch_malformed`
460 got checkout $testroot/repo $testroot/wt > /dev/null
462 if [ $ret -ne 0 ]; then
463 test_done $testroot $ret
468 cat <<EOF > $testroot/wt/patch
476 echo -n > $testroot/stdout.expected
477 echo "got: malformed patch" > $testroot/stderr.expected
479 (cd $testroot/wt && got patch patch) \
483 if [ $ret -eq 0 ]; then
484 echo "got managed to apply an invalid patch"
485 test_done $testroot 1
489 cmp -s $testroot/stdout.expected $testroot/stdout
491 if [ $ret -ne 0 ]; then
492 diff -u $testroot/stdout.expected $testroot/stdout
493 test_done $testroot $ret
497 cmp -s $testroot/stderr.expected $testroot/stderr
499 if [ $ret -ne 0 ]; then
500 diff -u $testroot/stderr.expected $testroot/stderr
501 test_done $testroot $ret
505 # wrong first character
506 cat <<EOF > $testroot/wt/patch
514 (cd $testroot/wt && got patch patch) \
518 if [ $ret -eq 0 ]; then
519 echo "got managed to apply an invalid patch"
520 test_done $testroot 1
524 cmp -s $testroot/stdout.expected $testroot/stdout
526 if [ $ret -ne 0 ]; then
527 diff -u $testroot/stdout.expected $testroot/stdout
528 test_done $testroot $ret
532 cmp -s $testroot/stderr.expected $testroot/stderr
534 if [ $ret -ne 0 ]; then
535 diff -u $testroot/stderr.expected $testroot/stderr
536 test_done $testroot $ret
541 cat <<EOF > $testroot/wt/patch
542 diff --git a/alpha b/iota
548 (cd $testroot/wt && got patch patch) \
552 if [ $ret -eq 0 ]; then
553 echo "got managed to apply an invalid patch"
554 test_done $testroot 1
558 cmp -s $testroot/stdout.expected $testroot/stdout
560 if [ $ret -ne 0 ]; then
561 diff -u $testroot/stdout.expected $testroot/stdout
562 test_done $testroot $ret
566 cmp -s $testroot/stderr.expected $testroot/stderr
568 if [ $ret -ne 0 ]; then
569 diff -u $testroot/stderr.expected $testroot/stderr
570 test_done $testroot $ret
574 test_done $testroot $ret
577 test_patch_no_patch() {
578 local testroot=`test_init patch_no_patch`
580 got checkout $testroot/repo $testroot/wt > /dev/null
582 if [ $ret -ne 0 ]; then
583 test_done $testroot $ret
587 cat <<EOF > $testroot/wt/patch
594 there's no patch in here!
597 echo -n > $testroot/stdout.expected
598 echo "got: no patch found" > $testroot/stderr.expected
600 (cd $testroot/wt && got patch patch) \
604 if [ $ret -eq 0 ]; then # should fail
605 test_done $testroot 1
609 cmp -s $testroot/stdout.expected $testroot/stdout
611 if [ $ret -ne 0 ]; then
612 diff -u $testroot/stdout.expected $testroot/stdout
613 test_done $testroot $ret
617 cmp -s $testroot/stderr.expected $testroot/stderr
619 if [ $ret -ne 0 ]; then
620 diff -u $testroot/stderr.expected $testroot/stderr
621 test_done $testroot $ret
625 test_done $testroot $ret
628 test_patch_equals_for_context() {
629 local testroot=`test_init patch_equals_for_context`
631 got checkout $testroot/repo $testroot/wt > /dev/null
633 if [ $ret -ne 0 ]; then
634 test_done $testroot $ret
638 cat <<EOF > $testroot/wt/patch
646 echo "M alpha" > $testroot/stdout.expected
648 (cd $testroot/wt && got patch patch) > $testroot/stdout
650 if [ $ret -ne 0 ]; then
651 test_done $testroot $ret
655 cmp -s $testroot/stdout.expected $testroot/stdout
657 if [ $ret -ne 0 ]; then
658 diff -u $testroot/stdout.expected $testroot/stdout
659 test_done $testroot $ret
663 echo hatsuseno > $testroot/wt/alpha.expected
664 echo alpha >> $testroot/wt/alpha.expected
665 cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
667 if [ $ret -ne 0 ]; then
668 diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
670 test_done $testroot $ret
673 test_patch_rename() {
674 local testroot=`test_init patch_rename`
676 got checkout $testroot/repo $testroot/wt > /dev/null
678 if [ $ret -ne 0 ]; then
679 test_done $testroot $ret
683 cat <<EOF > $testroot/wt/patch
684 diff --git a/beta b/iota
685 similarity index 100%
688 diff --git a/alpha b/eta
696 echo 'D beta' > $testroot/stdout.expected
697 echo 'A iota' >> $testroot/stdout.expected
698 echo 'D alpha' >> $testroot/stdout.expected
699 echo 'A eta' >> $testroot/stdout.expected
701 (cd $testroot/wt && got patch patch) > $testroot/stdout
703 if [ $ret -ne 0 ]; then
704 test_done $testroot $ret
708 cmp -s $testroot/stdout.expected $testroot/stdout
710 if [ $ret -ne 0 ]; then
711 diff -u $testroot/stdout.expected $testroot/stdout
712 test_done $testroot $ret
716 if [ -f $testroot/wt/alpha -o -f $testroot/wt/beta ]; then
717 echo "alpha or beta were not removed" >&2
718 test_done $testroot 1
721 if [ ! -f $testroot/wt/iota -o ! -f $testroot/wt/eta ]; then
722 echo "iota or eta were not created" >&2
723 test_done $testroot 1
727 echo beta > $testroot/wt/iota.expected
728 cmp -s $testroot/wt/iota.expected $testroot/wt/iota
730 if [ $ret -ne 0 ]; then
731 diff -u $testroot/wt/iota.expected $testroot/wt/iota
732 test_done $testroot $ret
736 echo eta > $testroot/wt/eta.expected
737 cmp -s $testroot/wt/eta.expected $testroot/wt/eta
739 if [ $ret -ne 0 ]; then
740 diff -u $testroot/wt/eta.expected $testroot/wt/eta
741 test_done $testroot $ret
745 test_done $testroot $ret
748 test_patch_illegal_status() {
749 local testroot=`test_init patch_illegal_status`
751 got checkout $testroot/repo $testroot/wt > /dev/null
753 if [ $ret -ne 0 ]; then
754 test_done $testroot $ret
758 # try to patch an obstructed file, add a versioned one, edit a
759 # non existent file and an unversioned one, and remove a
761 cat <<EOF > $testroot/wt/patch
787 echo kappa > $testroot/wt/kappa
788 rm $testroot/wt/alpha
789 mkdir $testroot/wt/alpha
791 (cd $testroot/wt && got patch patch) > $testroot/stdout \
794 if [ $ret -eq 0 ]; then
795 echo "edited a missing file" >&2
796 test_done $testroot 1
800 cat <<EOF > $testroot/stdout.expected
808 cat <<EOF > $testroot/stderr.expected
809 got: alpha: file has unexpected status
810 got: beta: file has unexpected status
811 got: iota: No such file or directory
812 got: kappa: file has unexpected status
813 got: lambda: No such file or directory
814 got: patch failed to apply
817 cmp -s $testroot/stdout.expected $testroot/stdout
819 if [ $ret -ne 0 ]; then
820 diff -u $testroot/stdout.expected $testroot/stdout
821 test_done $testroot $ret
825 cmp -s $testroot/stderr.expected $testroot/stderr
827 if [ $ret -ne 0 ]; then
828 diff -u $testroot/stderr.expected $testroot/stderr
829 test_done $testroot $ret
833 (cd $testroot/wt && got status) > $testroot/stdout
834 cat <<EOF > $testroot/stdout.expected
840 cmp -s $testroot/stdout.expected $testroot/stdout
842 if [ $ret -ne 0 ]; then
843 diff -u $testroot/stdout.expected $testroot/stdout
845 test_done $testroot $ret
849 local testroot=`test_init patch_nop`
851 got checkout $testroot/repo $testroot/wt > /dev/null
853 if [ $ret -ne 0 ]; then
854 test_done $testroot $ret
858 cat <<EOF > $testroot/wt/patch
868 diff --git a/gamma/delta b/gamma/delta.new
873 +delta updated and renamed!
876 (cd $testroot/wt && got patch -n patch)
878 if [ $ret -ne 0 ]; then
879 test_done $testroot $ret
883 # remove the patch to avoid the ? entry
884 rm $testroot/wt/patch
886 (cd $testroot/wt && got status) > $testroot/stdout
888 if [ $ret -ne 0 ]; then
889 test_done $testroot $ret
893 echo -n > $testroot/stdout.expected
894 cmp -s $testroot/stdout.expected $testroot/stdout
896 if [ $ret -ne 0 ]; then
897 diff -u $testroot/stdout.expected $testroot/stdout
899 test_done $testroot $ret
902 test_patch_preserve_perm() {
903 local testroot=`test_init patch_preserve_perm`
905 got checkout $testroot/repo $testroot/wt > /dev/null
907 if [ $ret -ne 0 ]; then
908 test_done $testroot $ret
912 chmod +x $testroot/wt/alpha
913 (cd $testroot/wt && got commit -m 'alpha executable') > /dev/null
915 if [ $ret -ne 0 ]; then
916 test_done $testroot $ret
920 cat <<EOF > $testroot/wt/patch
928 (cd $testroot/wt && got patch patch) > /dev/null
930 if [ $ret -ne 0 ]; then
931 test_done $testroot $ret
935 if [ ! -x $testroot/wt/alpha ]; then
936 echo "alpha is no more executable!" >&2
937 test_done $testroot 1
940 test_done $testroot 0
943 test_patch_create_dirs() {
944 local testroot=`test_init patch_create_dirs`
946 got checkout $testroot/repo $testroot/wt > /dev/null
948 if [ $ret -ne 0 ]; then
949 test_done $testroot $ret
953 cat <<EOF > $testroot/wt/patch
955 +++ iota/kappa/lambda
960 (cd $testroot/wt && got patch patch) > $testroot/stdout
962 if [ $ret -ne 0 ]; then
963 test_done $testroot $ret
967 echo 'A iota/kappa/lambda' >> $testroot/stdout.expected
968 cmp -s $testroot/stdout.expected $testroot/stdout
970 if [ $ret -ne 0 ]; then
971 diff -u $testroot/stdout.expected $testroot/stdout
972 test_done $testroot $ret
976 if [ ! -f $testroot/wt/iota/kappa/lambda ]; then
977 echo "file not created!" >&2
978 test_done $testroot $ret
981 test_done $testroot 0
984 test_patch_with_offset() {
985 local testroot=`test_init patch_with_offset`
987 got checkout $testroot/repo $testroot/wt > /dev/null
989 if [ $ret -ne 0 ]; then
990 test_done $testroot $ret
994 cat <<EOF > $testroot/wt/patch
1017 jot 100 > $testroot/wt/numbers
1018 ed $testroot/wt/numbers <<EOF > /dev/null 2> /dev/null
1025 (cd $testroot/wt && got add numbers && got commit -m '+numbers') \
1028 if [ $ret -ne 0 ]; then
1029 test_done $testroot $ret
1033 (cd $testroot/wt && got patch patch) > $testroot/stdout
1035 if [ $ret -ne 0 ]; then
1036 test_done $testroot/wt $ret
1040 cat <<EOF > $testroot/stdout.expected
1042 @@ -47,7 +47,7 @@ applied with offset -10
1043 @@ -87,7 +87,7 @@ applied with offset 10
1046 cmp -s $testroot/stdout.expected $testroot/stdout
1048 if [ $ret -ne 0 ]; then
1049 diff -u $testroot/stdout.expected $testroot/stdout
1051 test_done $testroot $ret
1054 test_patch_prefer_new_path() {
1055 local testroot=`test_init patch_orig`
1057 got checkout $testroot/repo $testroot/wt > /dev/null
1059 if [ $ret -ne 0 ]; then
1060 test_done $testroot $ret
1064 cat <<EOF > $testroot/wt/patch
1072 (cd $testroot/wt && got patch patch) > $testroot/stdout
1074 if [ $ret -ne 0 ]; then
1075 test_done $testroot $ret
1079 echo 'M alpha' > $testroot/stdout.expected
1080 cmp -s $testroot/stdout.expected $testroot/stdout
1082 if [ $ret -ne 0 ]; then
1083 diff -u $testroot/stdout.expected $testroot/stdout
1085 test_done $testroot $ret
1088 test_patch_no_newline() {
1089 local testroot=`test_init patch_no_newline`
1091 got checkout $testroot/repo $testroot/wt > /dev/null
1093 if [ $ret -ne 0 ]; then
1094 test_done $testroot $ret
1098 cat <<EOF > $testroot/wt/patch
1103 \ No newline at end of file
1106 (cd $testroot/wt && got patch patch) > $testroot/stdout
1108 if [ $ret -ne 0 ]; then
1109 test_done $testroot $ret
1113 echo "A eta" > $testroot/stdout.expected
1114 cmp -s $testroot/stdout.expected $testroot/stdout
1116 if [ $ret -ne 0 ]; then
1117 diff -u $testroot/stdout.expected $testroot/stdout
1118 test_done $testroot $ret
1122 echo -n eta > $testroot/wt/eta.expected
1123 cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1125 if [ $ret -ne 0 ]; then
1126 diff -u $testroot/wt/eta.expected $testroot/wt/eta
1127 test_done $testroot $ret
1131 (cd $testroot/wt && got commit -m 'add eta') > /dev/null
1133 if [ $ret -ne 0 ]; then
1134 test_done $testroot $ret
1138 cat <<EOF > $testroot/wt/patch
1143 \ No newline at end of file
1145 \ No newline at end of file
1148 (cd $testroot/wt && got patch patch) > $testroot/stdout
1150 if [ $ret -ne 0 ]; then
1151 test_done $testroot $ret
1155 echo "M eta" > $testroot/stdout.expected
1156 cmp -s $testroot/stdout.expected $testroot/stdout
1158 if [ $ret -ne 0 ]; then
1159 diff -u $testroot/stdout.expected $testroot/stdout
1160 test_done $testroot $ret
1164 echo -n ETA > $testroot/wt/eta.expected
1165 cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1167 if [ $ret -ne 0 ]; then
1168 diff -u $testroot/wt/eta.expected $testroot/wt/eta
1169 test_done $testroot $ret
1173 (cd $testroot/wt && got commit -m 'edit eta') > /dev/null
1175 if [ $ret -ne 0 ]; then
1176 test_done $testroot $ret
1180 cat <<EOF > $testroot/wt/patch
1185 \ No newline at end of file
1189 (cd $testroot/wt && got patch patch) > $testroot/stdout
1191 if [ $ret -ne 0 ]; then
1192 test_done $testroot $ret
1196 echo "M eta" > $testroot/stdout.expected
1197 cmp -s $testroot/stdout.expected $testroot/stdout
1199 if [ $ret -ne 0 ]; then
1200 diff -u $testroot/stdout.expected $testroot/stdout
1201 test_done $testroot $ret
1205 echo eta > $testroot/wt/eta.expected
1206 cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1208 if [ $ret -ne 0 ]; then
1209 diff -u $testroot/wt/eta.expected $testroot/wt/eta
1211 test_done $testroot $ret
1214 test_patch_strip() {
1215 local testroot=`test_init patch_strip`
1217 got checkout $testroot/repo $testroot/wt > /dev/null
1219 if [ $ret -ne 0 ]; then
1220 test_done $testroot $ret
1224 cat <<EOF > $testroot/wt/patch
1225 --- foo/bar/alpha.orig
1232 (cd $testroot/wt && got patch -p2 patch) > $testroot/stdout
1234 if [ $ret -ne 0 ]; then
1235 test_done $testroot $ret
1239 echo "M alpha" >> $testroot/stdout.expected
1240 cmp -s $testroot/stdout.expected $testroot/stdout
1242 if [ $ret -ne 0 ]; then
1243 diff -u $testroot/stdout.expected $testroot/stdout
1244 test_done $testroot $ret
1248 (cd $testroot/wt && got revert alpha) > /dev/null 2>&1
1250 if [ $ret -ne 0 ]; then
1251 test_done $testroot $ret
1255 (cd $testroot/wt && got patch -p3 patch) \
1258 if [ $ret -eq 0 ]; then
1259 echo "stripped more components than available!"
1260 test_done $testroot 1
1264 cat <<EOF > $testroot/stderr.expected
1265 got: can't strip 1 path-components from foo/bar/alpha: bad path
1268 cmp -s $testroot/stderr.expected $testroot/stderr
1270 if [ $ret -ne 0 ]; then
1271 diff -u $testroot/stderr.expected $testroot/stderr
1273 test_done $testroot 0
1276 test_patch_relative_paths() {
1277 local testroot=`test_init patch_relative_paths`
1279 got checkout $testroot/repo $testroot/wt > /dev/null
1281 if [ $ret -ne 0 ]; then
1282 test_done $testroot $ret
1286 cat <<EOF > $testroot/wt/gamma/patch
1298 (cd $testroot/wt/gamma && got patch patch) > $testroot/stdout
1300 if [ $ret -ne 0 ]; then
1301 test_done $testroot $ret
1305 echo 'M gamma/delta' > $testroot/stdout.expected
1306 echo 'A gamma/eta' >> $testroot/stdout.expected
1308 cmp -s $testroot/stdout.expected $testroot/stdout
1310 if [ $ret -ne 0 ]; then
1311 diff -u $testroot/stdout.expected $testroot/stdout
1313 test_done $testroot $ret
1316 test_patch_with_path_prefix() {
1317 local testroot=`test_init patch_with_path_prefix`
1319 got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1321 if [ $ret -ne 0 ]; then
1322 test_done $testroot $ret
1326 cat <<EOF > $testroot/wt/patch
1338 (cd $testroot/wt && got patch patch) > $testroot/stdout
1340 if [ $ret -ne 0 ]; then
1341 test_done $testroot $ret
1345 echo 'M delta' > $testroot/stdout.expected
1346 echo 'A eta' >> $testroot/stdout.expected
1348 cmp -s $testroot/stdout.expected $testroot/stdout
1350 if [ $ret -ne 0 ]; then
1351 diff -u $testroot/stdout.expected $testroot/stdout
1353 test_done $testroot $ret
1356 test_patch_relpath_with_path_prefix() {
1357 local testroot=`test_init patch_relpaths_with_path_prefix`
1359 got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1361 if [ $ret -ne 0 ]; then
1362 test_done $testroot $ret
1366 mkdir -p $testroot/wt/epsilon/zeta/
1368 cat <<EOF > $testroot/wt/patch
1375 (cd $testroot/wt/epsilon/zeta && got patch -p1 $testroot/wt/patch) \
1378 if [ $ret -ne 0 ]; then
1379 test_done $testroot $ret
1383 echo 'A epsilon/zeta/theta' >> $testroot/stdout.expected
1385 cmp -s $testroot/stdout.expected $testroot/stdout
1387 if [ $ret -ne 0 ]; then
1388 diff -u $testroot/stdout.expected $testroot/stdout
1389 test_done $testroot $ret
1393 echo 'theta' > $testroot/theta.expected
1394 cmp -s $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1396 if [ $ret -ne 0 ]; then
1397 diff -u $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1399 test_done $testroot $ret
1402 test_patch_reverse() {
1403 local testroot=`test_init patch_reverse`
1405 got checkout $testroot/repo $testroot/wt > /dev/null
1407 if [ $ret -ne 0 ]; then
1408 test_done $testroot $ret
1412 cat <<EOF > $testroot/wt/patch
1417 \ No newline at end of file
1421 (cd $testroot/wt && got patch -R patch) > $testroot/stdout
1423 if [ $ret -ne 0 ]; then
1424 test_done $testroot $ret
1428 echo "M alpha" > $testroot/stdout.expected
1429 cmp -s $testroot/stdout.expected $testroot/stdout
1431 if [ $ret -ne 0 ]; then
1432 diff -u $testroot/stdout.expected $testroot/stdout
1433 test_done $testroot $ret
1437 echo -n ALPHA > $testroot/wt/alpha.expected
1438 cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
1440 if [ $ret -ne 0 ]; then
1441 diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
1443 test_done $testroot $ret
1446 test_patch_merge_simple() {
1447 local testroot=`test_init patch_merge_simple`
1449 got checkout $testroot/repo $testroot/wt > /dev/null
1451 if [ $ret -ne 0 ]; then
1452 test_done $testroot $ret
1456 jot 10 > $testroot/wt/numbers
1457 (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1460 if [ $ret -ne 0 ]; then
1461 test_done $testroot $ret
1465 jot 10 | sed 's/4/four/g' > $testroot/wt/numbers
1467 (cd $testroot/wt && got diff > $testroot/old.diff \
1468 && got revert numbers) >/dev/null
1470 if [ $ret -ne 0 ]; then
1471 test_done $testroot $ret
1475 jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1476 (cd $testroot/wt && got commit -m 'edit numbers') \
1479 if [ $ret -ne 0 ]; then
1480 test_done $testroot $ret
1484 (cd $testroot/wt && got patch $testroot/old.diff) \
1487 if [ $ret -ne 0 ]; then
1488 test_done $testroot $ret
1492 jot 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1493 cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1495 if [ $ret -ne 0 ]; then
1496 diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1498 test_done $testroot $ret
1501 test_patch_merge_conflict() {
1502 local testroot=`test_init patch_merge_conflict`
1504 got checkout $testroot/repo $testroot/wt > /dev/null
1506 if [ $ret -ne 0 ]; then
1507 test_done $testroot $ret
1511 jot 10 > $testroot/wt/numbers
1512 (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1515 if [ $ret -ne 0 ]; then
1516 test_done $testroot $ret
1520 local commit_id=`git_show_head $testroot/repo`
1522 jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1524 (cd $testroot/wt && got diff > $testroot/old.diff \
1525 && got revert numbers) >/dev/null
1527 if [ $ret -ne 0 ]; then
1528 test_done $testroot $ret
1532 jot 10 | sed 's/6/3+3/g' > $testroot/wt/numbers
1533 (cd $testroot/wt && got commit -m 'edit numbers') \
1536 if [ $ret -ne 0 ]; then
1537 test_done $testroot $ret
1541 (cd $testroot/wt && got patch $testroot/old.diff) \
1544 if [ $ret -eq 0 ]; then
1545 echo "got patch merged a diff that should conflict" >&2
1546 test_done $testroot 0
1550 # XXX: prefixing every line with a tab otherwise got thinks
1551 # the file has conflicts in it.
1552 cat <<-EOF > $testroot/wt/numbers.expected
1560 ||||||| commit $commit_id
1571 cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1573 if [ $ret -ne 0 ]; then
1574 diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1576 test_done $testroot $ret
1579 test_patch_merge_unknown_blob() {
1580 local testroot=`test_init patch_merge_unknown_blob`
1582 got checkout $testroot/repo $testroot/wt > /dev/null
1584 if [ $ret -ne 0 ]; then
1585 test_done $testroot $ret
1589 cat <<EOF > $testroot/wt/patch
1591 blob - aaaabbbbccccddddeeeeffff0000111122223333
1593 blob + 0000111122223333444455556666888899990000
1603 (cd $testroot/wt/ && got patch patch) > $testroot/stdout
1605 if [ $ret -ne 0 ]; then
1606 test_done $testroot $ret
1610 echo 'M alpha' > $testroot/stdout.expected
1611 cmp -s $testroot/stdout.expected $testroot/stdout
1613 if [ $ret -ne 0 ]; then
1614 diff -u $testroot/stdout.expected $testroot/stdout
1616 test_done $testroot $ret
1620 run_test test_patch_simple_add_file
1621 run_test test_patch_simple_rm_file
1622 run_test test_patch_simple_edit_file
1623 run_test test_patch_prepend_line
1624 run_test test_patch_replace_line
1625 run_test test_patch_multiple_hunks
1626 run_test test_patch_multiple_files
1627 run_test test_patch_dont_apply
1628 run_test test_patch_malformed
1629 run_test test_patch_no_patch
1630 run_test test_patch_equals_for_context
1631 run_test test_patch_rename
1632 run_test test_patch_illegal_status
1633 run_test test_patch_nop
1634 run_test test_patch_preserve_perm
1635 run_test test_patch_create_dirs
1636 run_test test_patch_with_offset
1637 run_test test_patch_prefer_new_path
1638 run_test test_patch_no_newline
1639 run_test test_patch_strip
1640 run_test test_patch_relative_paths
1641 run_test test_patch_with_path_prefix
1642 run_test test_patch_relpath_with_path_prefix
1643 run_test test_patch_reverse
1644 run_test test_patch_merge_simple
1645 run_test test_patch_merge_conflict
1646 run_test test_patch_merge_unknown_blob