1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279
|
let hunk_eq a b =
let open Patch in
a.mine_start = b.mine_start &&
a.mine_len = b.mine_len &&
a.their_start = b.their_start &&
a.their_len = b.their_len &&
List.length a.mine = List.length b.mine &&
List.length a.their = List.length b.their &&
List.for_all (fun x -> List.mem x b.mine) a.mine &&
List.for_all (fun x -> List.mem x b.their) a.their
let patch_eq a b =
let open Patch in
operation_eq a.operation b.operation &&
List.length a.hunks = List.length b.hunks &&
List.for_all (fun h -> List.exists (fun h' -> hunk_eq h h') b.hunks) a.hunks
let test_t = Alcotest.testable Patch.pp patch_eq
let basic_files = [
Some "foo\n" ;
Some {|foo
bar
baz
boo
foo
bar
baz
boo
|} ;
Some {|foo
bar
baz
boo
foo
bar
bar
boo
foo
bar
baz
|} ;
Some {|foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
|} ;
None ;
Some "foo\n" ;
Some "foo\n" ]
let basic_diffs =
let hdr =
Printf.sprintf
{|--- a%s2019-03-10 16:48:51.826103000 +0100
+++ b%s2019-03-10 16:48:54.373352000 +0100
|} "\t" "\t"
in
[
hdr ^
{|@@ -1 +1 @@
-foo
+foobar
|} ;
hdr ^
{|@@ -2,7 +2,7 @@
bar
baz
boo
-foo
+foo2
bar
baz
boo
|} ;
hdr ^
{|@@ -1,5 +1,5 @@
foo
-bar
+bar2
baz
boo
foo
@@ -8,4 +8,4 @@
boo
foo
bar
-baz
+baz3
|} ;
hdr ^
{|@@ -1,6 +1,7 @@
foo
foo
foo
+foo3
foo
foo
foo
@@ -9,6 +10,7 @@
foo
foo
foo
+foo5
foo
foo
foo
@@ -31,6 +33,11 @@
foo
foo
foo
+bar
foo
foo
foo
+foo
+foo
+foo
+bar2
|} ;
{|--- /dev/null
+++ b
@@ -0,0 +1 @@
+foo
|} ;
{|--- a
+++ /dev/null
@@ -1 +0,0 @@
-foo
|} ;
{|--- a
+++ b
@@ -1 +1,2 @@
foo
+foo
|}
]
let basic_hunks =
let open Patch in
let hunk1 = [ { mine_start = 1 ; mine_len = 1 ; mine = ["foo"] ;
their_start = 1 ; their_len = 1 ; their = ["foobar"] } ]
in
let diff = { operation = Edit ("a", "b") ; hunks = hunk1 ; mine_no_nl = false ; their_no_nl = false } in
let hunk2 =
[ { mine_start = 2 ; mine_len = 7 ; mine = [ "bar" ; "baz" ; "boo" ; "foo" ; "bar" ; "baz" ; "boo" ] ;
their_start = 2 ; their_len = 7 ; their = [ "bar" ; "baz" ; "boo" ; "foo2" ; "bar" ; "baz" ; "boo" ] } ]
in
let hunk3 = [
{ mine_start = 1 ; mine_len = 5 ; mine = [ "foo" ; "bar" ; "baz" ; "boo" ; "foo" ] ;
their_start = 1 ; their_len = 5 ; their = [ "foo" ; "bar2" ; "baz" ; "boo" ; "foo" ] } ;
{ mine_start = 8 ; mine_len = 4 ; mine = [ "boo" ; "foo" ; "bar" ; "baz" ] ;
their_start = 8 ; their_len = 4 ; their = [ "boo" ; "foo" ; "bar" ; "baz3" ] }
] in
let hunk4 = [
{ mine_start = 1 ; mine_len = 6 ; mine = [ "foo" ; "foo" ; "foo" ; "foo" ; "foo" ; "foo" ] ;
their_start = 1 ; their_len = 7 ; their = [ "foo" ; "foo" ; "foo" ; "foo3" ; "foo" ; "foo" ; "foo" ] } ;
{ mine_start = 9 ; mine_len = 6 ; mine = [ "foo" ; "foo" ; "foo" ; "foo" ; "foo" ; "foo" ] ;
their_start = 10 ; their_len = 7 ; their = [ "foo" ; "foo" ; "foo" ; "foo5" ; "foo" ; "foo" ; "foo" ] } ;
{ mine_start = 31 ; mine_len = 6 ; mine = [ "foo" ; "foo" ; "foo" ; "foo" ; "foo" ; "foo" ] ;
their_start = 33 ; their_len = 11 ; their = [ "foo" ; "foo" ; "foo" ; "bar" ; "foo" ; "foo" ; "foo" ; "foo" ; "foo" ; "foo" ; "bar2" ] }
] in
let hunk5= [
{ mine_start = 0 ; mine_len = 0 ; mine = [] ;
their_start = 1 ; their_len = 1 ; their = [ "foo" ] }
] in
let diff5 = { diff with operation = Create "b" ; hunks = hunk5 } in
let hunk6 = [
{ mine_start = 1 ; mine_len = 1 ; mine = [ "foo" ] ;
their_start = 0 ; their_len = 0 ; their = [ ] }
] in
let diff6 = { diff with operation = Delete "a" ; hunks = hunk6 } in
let hunk7 = [
{ mine_start = 1 ; mine_len = 1 ; mine = [ "foo" ] ;
their_start = 1 ; their_len = 2 ; their = [ "foo" ; "foo" ] }
] in
let diff7 = { diff with operation = Edit ("a", "b") ; hunks = hunk7 } in
List.map (fun d -> [ d ])
[
diff ;
{ diff with hunks = hunk2 } ;
{ diff with hunks = hunk3 } ;
{ diff with hunks = hunk4 } ;
diff5 ;
diff6 ;
diff7 ;
]
let basic_app = [
Some "foobar\n" ;
Some {|foo
bar
baz
boo
foo2
bar
baz
boo
|} ;
Some {|foo
bar2
baz
boo
foo
bar
bar
boo
foo
bar
baz3
|} ;
Some {|foo
foo
foo
foo3
foo
foo
foo
foo
foo
foo
foo
foo
foo5
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
foo
bar
foo
foo
foo
foo
foo
foo
bar2
|} ;
Some {|foo
|} ;
None ;
Some {|foo
foo
|}
]
let basic_parse diff exp () =
let diffs = Patch.parse ~p:0 diff in
Alcotest.(check (list test_t) __LOC__ exp diffs)
let parse_diffs =
List.mapi (fun idx (diff, exp) ->
"basic" ^ string_of_int idx, `Quick, basic_parse diff exp)
(List.combine basic_diffs basic_hunks)
let basic_apply file diff exp () =
match Patch.parse ~p:0 diff with
| [ diff ] ->
let res = Patch.patch ~cleanly:true file diff in
Alcotest.(check (option string) __LOC__ exp res)
| _ -> Alcotest.fail "expected one"
let apply_diffs =
List.mapi (fun idx (exp, (data, diff)) ->
"basic" ^ string_of_int idx, `Quick, basic_apply data diff exp)
(List.combine basic_app (List.combine basic_files basic_diffs))
(* a diff with multiple files to patch, with each of the four kinds:
rename, delete, create, edit *)
let multi_diff = {|
--- foo
+++ bar
@@ -1 +1 @@
-bar
+foobar
--- foobar
+++ /dev/null
@@ -1 +0,0 @@
-baz
--- /dev/null
+++ baz
@@ -0,0 +1 @@
+baz
\ No newline at end of file
--- foobarbaz
+++ foobarbaz
@@ -1 +1 @@
-foobarbaz
+foobar
|}
let multi_hunks =
let open Patch in
let hunk1 = [ { mine_start = 1 ; mine_len = 1 ; mine = ["bar"] ;
their_start = 1 ; their_len = 1 ; their = ["foobar"] } ]
in
let diff1 = { operation = Edit ("foo", "bar") ; hunks = hunk1 ; mine_no_nl = false ; their_no_nl = false } in
let hunk2 =
[ { mine_start = 1 ; mine_len = 1 ; mine = [ "baz" ] ;
their_start = 0 ; their_len = 0 ; their = [] } ]
in
let diff2 = { operation = Delete "foobar" ; hunks = hunk2 ; mine_no_nl = false ; their_no_nl = false } in
let hunk3 = [
{ mine_start = 0 ; mine_len = 0 ; mine = [ ] ;
their_start = 1 ; their_len = 1 ; their = [ "baz" ] }
] in
let diff3 = { operation = Create "baz" ; hunks = hunk3 ; mine_no_nl = false ; their_no_nl = true } in
let hunk4 = [
{ mine_start = 1 ; mine_len = 1 ; mine = [ "foobarbaz" ] ;
their_start = 1 ; their_len = 1 ; their = [ "foobar" ] }
] in
let diff4 = { operation = Edit ("foobarbaz", "foobarbaz") ; hunks = hunk4 ; mine_no_nl = false ; their_no_nl = false } in
[ diff1 ; diff2 ; diff3 ; diff4 ]
let multi_files = [ Some "bar" ; Some "baz" ; None ; Some "foobarbaz" ]
let multi_exp = [ Some "foobar" ; None ; Some "baz" ; Some "foobar" ]
let multi_apply () =
let diffs = Patch.parse ~p:0 multi_diff in
Alcotest.(check int __LOC__ (List.length multi_files) (List.length diffs));
Alcotest.(check int __LOC__ (List.length multi_exp) (List.length diffs));
List.iter2 (fun diff (input, expected) ->
let res = Patch.patch ~cleanly:true input diff in
Alcotest.(check (option string) __LOC__ expected res))
diffs (List.combine multi_files multi_exp)
let multi_diffs = [
"multi parse", `Quick, basic_parse multi_diff multi_hunks ;
"multi apply", `Quick, multi_apply ;
]
let regression_diff, regression_hunks =
let open Patch in
{|
--- a 2024-03-22 20:38:14.411917871 +0000
+++ b 2024-03-22 20:04:53.409348792 +0000
@@ -1 +1 @@
--- /dev/null
+aaa
|},
[ { operation = Edit ("a", "b");
hunks = [ { mine_start = 1; mine_len = 1; mine = ["-- /dev/null"];
their_start = 1; their_len = 1; their = ["aaa"]} ];
mine_no_nl = false; their_no_nl = false} ]
let basic_regression_diffs = [
"basic regression parse", `Quick, basic_parse regression_diff regression_hunks ;
]
let data = "data/"
let read file =
let filename = data ^ file in
let size = (Unix.stat filename).st_size in
let buf = Bytes.create size in
let fd = Unix.openfile filename [ Unix.O_RDONLY ] 0 in
let res =
let rec loop i = function
| 0 -> i
| size ->
let nread = Unix.read fd buf i size in
loop (i + nread) (size - nread)
in
loop 0 size
in
assert (res = size) ;
Unix.close fd ;
Bytes.unsafe_to_string buf
let opt_read file = try Some (read file) with Unix.Unix_error _ -> None
let op_test = Alcotest.testable Patch.pp_operation Patch.operation_eq
let parse_real_diff_header file hdr () =
let data = read (file ^ ".diff") in
let diffs = Patch.parse ~p:0 data in
Alcotest.(check int __LOC__ 1 (List.length diffs));
Alcotest.check op_test __LOC__ hdr (List.hd diffs).Patch.operation
let parse_real_diff_headers =
List.map (fun (file, hdr) ->
"parsing " ^ file ^ ".diff", `Quick, parse_real_diff_header file hdr)
[ "first", Patch.Edit ("first.old", "first.new") ;
"create1", Patch.Create "a/create1" ;
"git1", Patch.Create "b/git1.new" ;
"git2", Patch.Git_ext ("a/git2.old", "b/git2.new",
Patch.Rename_only ("git2.old", "git2.new")) ;
"git3", Patch.Edit ("a/git3.old", "b/git3.new") ;
"git4", Patch.Delete "a/git4.old"
]
let regression_test name () =
let old = opt_read (name ^ ".old") in
let diff = read (name ^ ".diff") in
let exp = opt_read (name ^ ".new") in
match Patch.parse ~p:0 diff with
| [ diff ] ->
let res = Patch.patch ~cleanly:true old diff in
Alcotest.(check (option string) __LOC__ exp res)
| ds -> Alcotest.fail ("expected one, found " ^ string_of_int (List.length ds))
module S = Set.Make(String)
let drop_ext str =
try
let idx = String.rindex str '.' in
String.sub str 0 idx
with
| Not_found -> str
let regression_diffs =
let collect_dir dir =
let open Unix in
let dh = opendir dir in
let next () = try Some (readdir dh) with End_of_file -> None in
let rec doone acc = function
| Some "." | Some ".." -> doone acc (next ())
| Some s when not (Sys.is_directory (Filename.concat dir s)) -> doone (s :: acc) (next ())
| Some _ -> doone acc (next ())
| None -> acc
in
let res = doone [] (next ()) in
closedir dh ;
res
in
let files = collect_dir data in
let tests = List.fold_left (fun acc file -> S.add (drop_ext file) acc) S.empty files in
List.map (fun test -> "regression " ^ test, `Quick, regression_test test) (S.elements tests)
let diff_tests_mine_unavailable_gen ~their_no_nl =
let a = None
and b =
{|aaa
bbb
ccc
ddd
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff a (Some ("b", b)) in
let hunk =
{ Patch.operation = Create "b";
hunks = [ { mine_start = 0; mine_len = 0; mine = [];
their_start = 1; their_len = 5; their = ["aaa"; "bbb"; "ccc"; "ddd"; "eee"]} ];
mine_no_nl = false; their_no_nl}
in
diff, Some hunk
let diff_tests_mine_unavailable_their_no_nl, diff_tests_hunk_mine_unavailable_their_no_nl =
diff_tests_mine_unavailable_gen ~their_no_nl:true
let diff_tests_mine_unavailable_none_no_nl, diff_tests_hunk_mine_unavailable_none_no_nl =
diff_tests_mine_unavailable_gen ~their_no_nl:false
let diff_tests_their_unavailable_gen ~mine_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b = None
in
let diff = Patch.diff (Some ("a", a)) b in
let hunk =
{ Patch.operation = Delete "a";
hunks = [ { mine_start = 1; mine_len = 5; mine = ["aaa"; "bbb"; "ccc"; "ddd"; "eee"];
their_start = 0; their_len = 0; their = []} ];
mine_no_nl; their_no_nl = false}
in
diff, Some hunk
let diff_tests_their_unavailable_mine_no_nl, diff_tests_hunk_their_unavailable_mine_no_nl =
diff_tests_their_unavailable_gen ~mine_no_nl:true
let diff_tests_their_unavailable_none_no_nl, diff_tests_hunk_their_unavailable_none_no_nl =
diff_tests_their_unavailable_gen ~mine_no_nl:false
let diff_tests_empty_gen ~mine_no_nl ~their_no_nl =
let a = if mine_no_nl then "" else "\n"
and b = if their_no_nl then "" else "\n" in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
if (mine_no_nl && their_no_nl) || (not mine_no_nl && not their_no_nl) then
None
else
let mine_len, mine = if mine_no_nl then 0, [] else 1, [""] in
let their_len, their = if their_no_nl then 0, [] else 1, [""] in
Some { Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = if mine_no_nl then 0 else 1; mine_len; mine;
their_start = if their_no_nl then 0 else 1; their_len; their} ];
mine_no_nl = false; their_no_nl = false}
in
diff, hunk
let diff_tests_empty_both_no_nl, diff_tests_hunk_empty_both_no_nl =
diff_tests_empty_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_empty_mine_no_nl, diff_tests_hunk_empty_mine_no_nl =
diff_tests_empty_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_empty_their_no_nl, diff_tests_hunk_empty_their_no_nl =
diff_tests_empty_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_empty_none_no_nl, diff_tests_hunk_empty_none_no_nl =
diff_tests_empty_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_no_diff_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|aaa
bbb
ccc
ddd
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
if (mine_no_nl && their_no_nl) || (not mine_no_nl && not their_no_nl) then
None
else
Some { Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 5; mine_len = 1; mine = ["eee"];
their_start = 5; their_len = 1; their = ["eee"]} ];
mine_no_nl; their_no_nl}
in
diff, hunk
let diff_tests_no_diff_both_no_nl, diff_tests_hunk_no_diff_both_no_nl =
diff_tests_no_diff_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_no_diff_mine_no_nl, diff_tests_hunk_no_diff_mine_no_nl =
diff_tests_no_diff_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_no_diff_their_no_nl, diff_tests_hunk_no_diff_their_no_nl =
diff_tests_no_diff_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_no_diff_none_no_nl, diff_tests_hunk_no_diff_none_no_nl =
diff_tests_no_diff_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_middle_same_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|aaa
bbb
test1
test2
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 3; mine_len = 3; mine = ["ccc"; "ddd"; "eee"];
their_start = 3; their_len = 3; their = ["test1"; "test2"; "eee"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_middle_same_size_both_no_nl, diff_tests_hunk_middle_same_size_both_no_nl =
diff_tests_middle_same_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_middle_same_size_mine_no_nl, diff_tests_hunk_middle_same_size_mine_no_nl =
diff_tests_middle_same_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_middle_same_size_their_no_nl, diff_tests_hunk_middle_same_size_their_no_nl =
diff_tests_middle_same_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_middle_same_size_none_no_nl, diff_tests_hunk_middle_same_size_none_no_nl =
diff_tests_middle_same_size_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_middle_diff_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|aaa
bbb
test1
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 3; mine_len = 3; mine = ["ccc"; "ddd"; "eee"];
their_start = 3; their_len = 2; their = ["test1"; "eee"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_middle_diff_size_both_no_nl, diff_tests_hunk_middle_diff_size_both_no_nl =
diff_tests_middle_diff_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_middle_diff_size_mine_no_nl, diff_tests_hunk_middle_diff_size_mine_no_nl =
diff_tests_middle_diff_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_middle_diff_size_their_no_nl, diff_tests_hunk_middle_diff_size_their_no_nl =
diff_tests_middle_diff_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_middle_diff_size_none_no_nl, diff_tests_hunk_middle_diff_size_none_no_nl =
diff_tests_middle_diff_size_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_beginning_same_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|test1
bbb
ccc
ddd
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 1; mine_len = 5; mine = ["aaa"; "bbb"; "ccc"; "ddd"; "eee"];
their_start = 1; their_len = 5; their = ["test1"; "bbb"; "ccc"; "ddd"; "eee"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_beginning_same_size_both_no_nl, diff_tests_hunk_beginning_same_size_both_no_nl =
diff_tests_beginning_same_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_beginning_same_size_mine_no_nl, diff_tests_hunk_beginning_same_size_mine_no_nl =
diff_tests_beginning_same_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_beginning_same_size_their_no_nl, diff_tests_hunk_beginning_same_size_their_no_nl =
diff_tests_beginning_same_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_beginning_same_size_none_no_nl, diff_tests_hunk_beginning_same_size_none_no_nl =
diff_tests_beginning_same_size_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_beginning_diff_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|test1
ccc
ddd
eee|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 1; mine_len = 5; mine = ["aaa"; "bbb"; "ccc"; "ddd"; "eee"];
their_start = 1; their_len = 4; their = ["test1"; "ccc"; "ddd"; "eee"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_beginning_diff_size_both_no_nl, diff_tests_hunk_beginning_diff_size_both_no_nl =
diff_tests_beginning_diff_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_beginning_diff_size_mine_no_nl, diff_tests_hunk_beginning_diff_size_mine_no_nl =
diff_tests_beginning_diff_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_beginning_diff_size_their_no_nl, diff_tests_hunk_beginning_diff_size_their_no_nl =
diff_tests_beginning_diff_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_beginning_diff_size_none_no_nl, diff_tests_hunk_beginning_diff_size_none_no_nl =
diff_tests_beginning_diff_size_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_end_same_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|aaa
bbb
ccc
ddd
test1|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 5; mine_len = 1; mine = ["eee"];
their_start = 5; their_len = 1; their = ["test1"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_end_same_size_both_no_nl, diff_tests_hunk_end_same_size_both_no_nl =
diff_tests_end_same_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_end_same_size_mine_no_nl, diff_tests_hunk_end_same_size_mine_no_nl =
diff_tests_end_same_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_end_same_size_their_no_nl, diff_tests_hunk_end_same_size_their_no_nl =
diff_tests_end_same_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_end_same_size_none_no_nl, diff_tests_hunk_end_same_size_none_no_nl =
diff_tests_end_same_size_gen ~mine_no_nl:false ~their_no_nl:false
let diff_tests_end_diff_size_gen ~mine_no_nl ~their_no_nl =
let a =
{|aaa
bbb
ccc
ddd
eee|}^(if mine_no_nl then "" else "\n")
and b =
{|aaa
bbb
ccc
test1|}^(if their_no_nl then "" else "\n")
in
let diff = Patch.diff (Some ("a", a)) (Some ("b", b)) in
let hunk =
{ Patch.operation = Edit ("a", "b");
hunks = [ { mine_start = 4; mine_len = 2; mine = ["ddd"; "eee"];
their_start = 4; their_len = 1; their = ["test1"]} ];
mine_no_nl; their_no_nl}
in
diff, Some hunk
let diff_tests_end_diff_size_both_no_nl, diff_tests_hunk_end_diff_size_both_no_nl =
diff_tests_end_diff_size_gen ~mine_no_nl:true ~their_no_nl:true
let diff_tests_end_diff_size_mine_no_nl, diff_tests_hunk_end_diff_size_mine_no_nl =
diff_tests_end_diff_size_gen ~mine_no_nl:true ~their_no_nl:false
let diff_tests_end_diff_size_their_no_nl, diff_tests_hunk_end_diff_size_their_no_nl =
diff_tests_end_diff_size_gen ~mine_no_nl:false ~their_no_nl:true
let diff_tests_end_diff_size_none_no_nl, diff_tests_hunk_end_diff_size_none_no_nl =
diff_tests_end_diff_size_gen ~mine_no_nl:false ~their_no_nl:false
let check_diff diff1 diff2 () =
Alcotest.(check (option test_t) __LOC__ diff1 diff2)
let unified_diff_creation = [
"mine unavailable, their no_nl", `Quick, check_diff diff_tests_mine_unavailable_their_no_nl diff_tests_hunk_mine_unavailable_their_no_nl ;
"mine unavailable, none no_nl", `Quick, check_diff diff_tests_mine_unavailable_none_no_nl diff_tests_hunk_mine_unavailable_none_no_nl;
"their unavailable, mine no_nl", `Quick, check_diff diff_tests_their_unavailable_mine_no_nl diff_tests_hunk_their_unavailable_mine_no_nl ;
"their unavailable, none no_nl", `Quick, check_diff diff_tests_their_unavailable_none_no_nl diff_tests_hunk_their_unavailable_none_no_nl ;
"empty, both no_nl", `Quick, check_diff diff_tests_empty_both_no_nl diff_tests_hunk_empty_both_no_nl;
"empty, mine no_nl", `Quick, check_diff diff_tests_empty_mine_no_nl diff_tests_hunk_empty_mine_no_nl;
"empty, their no_nl", `Quick, check_diff diff_tests_empty_their_no_nl diff_tests_hunk_empty_their_no_nl;
"empty, none no_nl", `Quick, check_diff diff_tests_empty_none_no_nl diff_tests_hunk_empty_none_no_nl;
"no diff, both no_nl", `Quick, check_diff diff_tests_no_diff_both_no_nl diff_tests_hunk_no_diff_both_no_nl ;
"no diff, mine no_nl", `Quick, check_diff diff_tests_no_diff_mine_no_nl diff_tests_hunk_no_diff_mine_no_nl ;
"no diff, their no_nl", `Quick, check_diff diff_tests_no_diff_their_no_nl diff_tests_hunk_no_diff_their_no_nl ;
"no diff, none no_nl", `Quick, check_diff diff_tests_no_diff_none_no_nl diff_tests_hunk_no_diff_none_no_nl ;
"middle, same size, both no_nl", `Quick, check_diff diff_tests_middle_same_size_both_no_nl diff_tests_hunk_middle_same_size_both_no_nl ;
"middle, same size, mine no_nl", `Quick, check_diff diff_tests_middle_same_size_mine_no_nl diff_tests_hunk_middle_same_size_mine_no_nl;
"middle, same size, their no_nl", `Quick, check_diff diff_tests_middle_same_size_their_no_nl diff_tests_hunk_middle_same_size_their_no_nl ;
"middle, same size, none no_nl", `Quick, check_diff diff_tests_middle_same_size_none_no_nl diff_tests_hunk_middle_same_size_none_no_nl ;
"middle, diff size, both no_nl", `Quick, check_diff diff_tests_middle_diff_size_both_no_nl diff_tests_hunk_middle_diff_size_both_no_nl ;
"middle, diff size, mine no_nl", `Quick, check_diff diff_tests_middle_diff_size_mine_no_nl diff_tests_hunk_middle_diff_size_mine_no_nl ;
"middle, diff size, their no_nl", `Quick, check_diff diff_tests_middle_diff_size_their_no_nl diff_tests_hunk_middle_diff_size_their_no_nl ;
"middle, diff size, none no_nl", `Quick, check_diff diff_tests_middle_diff_size_none_no_nl diff_tests_hunk_middle_diff_size_none_no_nl ;
"beginning, same size, both no_nl", `Quick, check_diff diff_tests_beginning_same_size_both_no_nl diff_tests_hunk_beginning_same_size_both_no_nl ;
"beginning, same size, mine no_nl", `Quick, check_diff diff_tests_beginning_same_size_mine_no_nl diff_tests_hunk_beginning_same_size_mine_no_nl ;
"beginning, same size, their no_nl", `Quick, check_diff diff_tests_beginning_same_size_their_no_nl diff_tests_hunk_beginning_same_size_their_no_nl ;
"beginning, same size, none no_nl", `Quick, check_diff diff_tests_beginning_same_size_none_no_nl diff_tests_hunk_beginning_same_size_none_no_nl ;
"beginning, diff size, both no_nl", `Quick, check_diff diff_tests_beginning_diff_size_both_no_nl diff_tests_hunk_beginning_diff_size_both_no_nl ;
"beginning, diff size, mine no_nl", `Quick, check_diff diff_tests_beginning_diff_size_mine_no_nl diff_tests_hunk_beginning_diff_size_mine_no_nl ;
"beginning, diff size, their no_nl", `Quick, check_diff diff_tests_beginning_diff_size_their_no_nl diff_tests_hunk_beginning_diff_size_their_no_nl ;
"beginning, diff size, none no_nl", `Quick, check_diff diff_tests_beginning_diff_size_none_no_nl diff_tests_hunk_beginning_diff_size_none_no_nl ;
"end, same size, both no_nl", `Quick, check_diff diff_tests_end_same_size_both_no_nl diff_tests_hunk_end_same_size_both_no_nl ;
"end, same size, mine no_nl", `Quick, check_diff diff_tests_end_same_size_mine_no_nl diff_tests_hunk_end_same_size_mine_no_nl ;
"end, same size, their no_nl", `Quick, check_diff diff_tests_end_same_size_their_no_nl diff_tests_hunk_end_same_size_their_no_nl ;
"end, same size, none no_nl", `Quick, check_diff diff_tests_end_same_size_none_no_nl diff_tests_hunk_end_same_size_none_no_nl ;
"end, diff size, both no_nl", `Quick, check_diff diff_tests_end_diff_size_both_no_nl diff_tests_hunk_end_diff_size_both_no_nl ;
"end, diff size, mine no_nl", `Quick, check_diff diff_tests_end_diff_size_mine_no_nl diff_tests_hunk_end_diff_size_mine_no_nl ;
"end, diff size, their no_nl", `Quick, check_diff diff_tests_end_diff_size_their_no_nl diff_tests_hunk_end_diff_size_their_no_nl ;
"end, diff size, none no_nl", `Quick, check_diff diff_tests_end_diff_size_none_no_nl diff_tests_hunk_end_diff_size_none_no_nl ;
]
let operations exp diff () =
let ops = diff |> Patch.parse ~p:0 |> List.map (fun p -> p.Patch.operation) in
Alcotest.(check (list op_test)) __LOC__ exp ops
let unified_diff_spaces = {|\
--- "a/foo bar" 2024-09-04 10:56:24.139293679 +0200
+++ "b/foo bar" 2024-09-04 10:56:12.519195763 +0200
@@ -1 +1 @@
-This is wrong.
+This is right.
|}
let unified_diff_spaces =
operations [Patch.Edit ("a/foo bar", "b/foo bar")] unified_diff_spaces
let git_diff_spaces = {|\
diff --git a/foo bar b/foo bar
index ef00db3..88adca3 100644
--- a/foo bar|}^"\t"^{|
+++ b/foo bar|}^"\t"^{|
@@ -1 +1 @@
-This is wrong.
+This is right.
|}
let git_diff_spaces =
operations [Patch.Edit ("a/foo bar", "b/foo bar")] git_diff_spaces
let busybox_diff_spaces = {|\
--- a/foo bar
+++ b/foo bar
@@ -1 +1 @@
-This is wrong.
+This is right.
|}
let busybox_diff_spaces =
operations [Patch.Edit ("a/foo", "b/foo")] busybox_diff_spaces
let unified_diff_quotes = {|\
--- "foo bar \"baz\"" 2024-09-27 11:09:48.325541553 +0200
+++ "\"foo\" bar baz" 2024-09-27 11:06:42.612922437 +0200
@@ -1 +1 @@
-This is right.
+This is wrong.
|}
let unified_diff_quotes =
operations [Patch.Edit ({|foo bar "baz"|}, {|"foo" bar baz|})] unified_diff_quotes
let git_diff_quotes = {|\
diff --git "a/foo bar \"baz\"" "b/\"foo\" bar baz"
index 88adca3..ef00db3 100644
--- "a/foo bar \"baz\""
+++ "b/\"foo\" bar baz"
@@ -1 +1 @@
-This is right.
+This is wrong.
|}
let git_diff_quotes =
operations [Patch.Edit ({|a/foo bar "baz"|}, {|b/"foo" bar baz|})] git_diff_quotes
let busybox_diff_quotes = {|\
--- foo bar "baz"
+++ "foo" bar baz
@@ -1 +1 @@
-This is right.
+This is wrong.
|}
let busybox_diff_quotes =
operations [Patch.Edit ({|foo|}, {|foo|})] busybox_diff_quotes
let dev_null_like = {|\
--- /dev/null_but_actually_not
+++ b
@@ -0,0 +1 @@
+foo
|}
let dev_null_like =
operations [Patch.Edit ("/dev/null_but_actually_not", "b")] dev_null_like
let macos_diff_N_deletion = {|\
diff -ruaN a/test b/test
--- a/test 2024-03-21 11:29:11
+++ b/test 1970-01-01 01:00:00
@@ -1 +0,0 @@
-aaa
|}
let macos_diff_N_deletion =
operations [Patch.Delete "a/test"] macos_diff_N_deletion
let openbsd_diff_N_deletion = {|\
diff -ruaN a/test b/test
--- a/test Thu Mar 21 12:34:45 2024
+++ b/test Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-aaa
|}
let openbsd_diff_N_deletion =
operations [Patch.Delete "a/test"] openbsd_diff_N_deletion
let gnu_diff_N_deletion = {|\
diff -ruaN a/test b/test
--- a/test 2024-03-21 11:35:38.363194916 +0000
+++ b/test 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-aaa
|}
let gnu_diff_N_deletion =
operations [Patch.Delete "a/test"] gnu_diff_N_deletion
let busybox_diff_N_deletion = {|\
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-aaa
|}
let busybox_diff_N_deletion =
operations [Patch.Delete "a/test"] busybox_diff_N_deletion
let quoted_filename = {|\
--- /dev/null
+++ "\a\b\f\n\r\t\v\\\"\001\177\046"
@@ -0,0 +1 @@
+aaa
|}
let quoted_filename =
operations [Patch.Create "\007\b\012\n\r\t\011\\\"\001\127&"] quoted_filename
let unquoted_filename = {|\
--- /dev/null
+++ \a\b\f\n\r\t\v\\\"\001\177\046
@@ -0,0 +1 @@
+aaa
|}
let unquoted_filename =
operations [Patch.Create {|\a\b\f\n\r\t\v\\\"\001\177\046|}] unquoted_filename
let filename_diffs =
[
"unified diff with spaces", `Quick, unified_diff_spaces;
"git diff with spaces", `Quick, git_diff_spaces;
"busybox diff with spaces", `Quick, busybox_diff_spaces;
"unified diff with quotes", `Quick, unified_diff_quotes;
"git diff with quotes", `Quick, git_diff_quotes;
"busybox diff with quotes", `Quick, busybox_diff_quotes;
"file that looks like /dev/null", `Quick, dev_null_like;
"diff -uN with file deletion on macOS", `Quick, macos_diff_N_deletion;
"diff -uN with file deletion on OpenBSD", `Quick, openbsd_diff_N_deletion;
"diff -uN with file deletion with GNU diff", `Quick, gnu_diff_N_deletion;
"diff -uN with file deletion with Busybox", `Quick, busybox_diff_N_deletion;
"heavily quoted filename", `Quick, quoted_filename;
"unquoted filename with backslashes", `Quick, unquoted_filename;
]
let operations ~p exp diff () =
let ops = diff |> Patch.parse ~p |> List.map (fun p -> p.Patch.operation) in
Alcotest.(check (list op_test)) __LOC__ exp ops
let p1_p2 = {|\
--- a.orig/a/test
+++ b.new/b/test
@@ -0,0 +1 @@
+aaa
|}
let p1 = operations ~p:1 [Patch.Edit ("a/test", "b/test")] p1_p2
let p2 = operations ~p:2 [Patch.Edit ("test", "test")] p1_p2
let p1_adjacent_slashes = {|\
--- a///some//dir////test
+++ b///some/dir/test
@@ -0,0 +1 @@
+aaa
|}
let p1_adjacent_slashes = operations ~p:1 [Patch.Edit ("some/dir/test", "some/dir/test")] p1_adjacent_slashes
let p0_p1_root = {|\
--- /a/test
+++ /b/test
@@ -0,0 +1 @@
+aaa
|}
let p0_root = operations ~p:0 [Patch.Edit ("/a/test", "/b/test")] p0_p1_root
let p1_root = operations ~p:1 [Patch.Edit ("a/test", "b/test")] p0_p1_root
let patch_p = [
"-p1", `Quick, p1;
"-p2", `Quick, p2;
"-p1 with adjacent slashes", `Quick, p1_adjacent_slashes;
"-p0 with root files", `Quick, p0_root;
"-p1 with root files", `Quick, p1_root;
]
let pp_output_test = Alcotest.testable Format.pp_print_string String.equal
let operations exp str () =
let exp = Format.asprintf "%a" Patch.pp_operation exp in
Alcotest.(check pp_output_test) __LOC__ str exp
let plain_filename =
{|--- a/test
+++ b/test
|}
let plain_filename = operations (Patch.Edit ("a/test", "b/test")) plain_filename
let filename_with_spaces =
{|--- "a/one space"
+++ "b/with two spaces"
|}
let filename_with_spaces = operations (Patch.Edit ("a/one space", "b/with two spaces")) filename_with_spaces
let filename_with_special_chars =
{|--- "\a\b\f\n\r\t\v some name \\\"\001\177&"
+++ /dev/null
|}
let filename_with_special_chars = operations (Patch.Delete "\007\b\012\n\r\t\011 some name \\\"\001\127&") filename_with_special_chars
let pp_filenames = [
"plain", `Quick, plain_filename;
"with spaces", `Quick, filename_with_spaces;
"with special characters", `Quick, filename_with_special_chars;
]
let big_file = lazy (opt_read "./external/2025-01-before-archiving-phase1_999bff3ed88d26f76ff7eaddbfa7af49ed4737dc.diff")
let expected = lazy (opt_read "./external/2025-01-before-archiving-phase1_999bff3ed88d26f76ff7eaddbfa7af49ed4737dc.expected")
let support_string_length_above_20MB = Sys.max_string_length > 20_000_000
let parse_big () =
if support_string_length_above_20MB then
match Lazy.force big_file with
| Some big_file ->
let patch = Patch.parse ~p:1 big_file in
Alcotest.(check int) __LOC__ 13_915 (List.length patch)
| None -> Alcotest.skip ()
else Alcotest.skip ()
let print_big () =
if support_string_length_above_20MB then
match Lazy.force big_file, Lazy.force expected with
| Some big_file, Some expected ->
let patch = Patch.parse ~p:0 big_file in
let actual = Format.asprintf "%a" Patch.pp_list patch in
Alcotest.(check string) __LOC__ expected actual
| None, _ | _, None -> Alcotest.skip ()
else Alcotest.skip ()
let parse_own () =
if support_string_length_above_20MB then
match Lazy.force expected with
| Some expected ->
let patch = Patch.parse ~p:0 expected in
let actual = Format.asprintf "%a" Patch.pp_list patch in
Alcotest.(check string) __LOC__ expected actual
| None -> Alcotest.skip ()
else Alcotest.skip ()
let one_mil_old = lazy (opt_read "./external/1_000_000-old.txt")
let one_mil_new = lazy (opt_read "./external/1_000_000-new.txt")
let one_mil_diff = lazy (opt_read "./external/1_000_000.diff")
let one_mil_print () =
match Lazy.force one_mil_old, Lazy.force one_mil_new, Lazy.force one_mil_diff with
| Some one_mil_old, Some one_mil_new, Some expected ->
let patch = Patch.diff (Some ("1_000_000-old.txt", one_mil_old)) (Some ("1_000_000-new.txt", one_mil_new)) in
let actual = Format.asprintf "%a" Patch.pp (Option.get patch) in
Alcotest.(check string) __LOC__ expected actual
| None, _, _ | _, None, _ | _, _, None -> Alcotest.skip ()
let one_mil_apply () =
match Lazy.force one_mil_old, Lazy.force one_mil_new, Lazy.force one_mil_diff with
| Some one_mil_old, Some expected, Some diff ->
let patch = Patch.parse ~p:0 diff in
let actual = Patch.patch ~cleanly:true (Some one_mil_old) (List.hd patch) in
Alcotest.(check string) __LOC__ expected (Option.get actual)
| None, _, _ | _, None, _ | _, _, None -> Alcotest.skip ()
let many_hunks_old = lazy (opt_read "./external/many-hunks.old")
let many_hunks_new = lazy (opt_read "./external/many-hunks.new")
let many_hunks_diff = lazy (opt_read "./external/many-hunks.diff")
let many_hunks_apply () =
match Lazy.force many_hunks_old, Lazy.force many_hunks_new, Lazy.force many_hunks_diff with
| Some many_hunks_old, Some expected, Some diff ->
let patch = Patch.parse ~p:0 diff in
let actual = Patch.patch ~cleanly:true (Some many_hunks_old) (List.hd patch) in
Alcotest.(check string) __LOC__ expected (Option.get actual)
| None, _, _ | _, None, _ | _, _, None -> Alcotest.skip ()
let big_diff = [
"parse", `Quick, parse_big;
"print", `Quick, print_big;
"parse own", `Quick, parse_own;
"1_000_000 print", `Quick, one_mil_print;
"1_000_000 apply", `Quick, one_mil_apply;
"many-hunks apply", `Quick, many_hunks_apply;
]
let print_diff_mine_empty_their_no_nl () =
let a = {||} in
let b = {|aaa
bbb
ccc|} in
let expected = {|--- a
+++ b
@@ -0,0 +1,3 @@
+aaa
+bbb
+ccc
\ No newline at end of file
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_empty_their_nl () =
let a = {||} in
let b = {|aaa
bbb
ccc
|} in
let expected = {|--- a
+++ b
@@ -0,0 +1,3 @@
+aaa
+bbb
+ccc
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_no_nl_their_empty () =
let a = {|aaa
bbb|} in
let b = {||} in
let expected = {|--- a
+++ b
@@ -1,2 +0,0 @@
-aaa
-bbb
\ No newline at end of file
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_nl_their_empty () =
let a = {|aaa
bbb
|} in
let b = {||} in
let expected = {|--- a
+++ b
@@ -1,2 +0,0 @@
-aaa
-bbb
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_no_nl_their_no_nl () =
let a = {|aaa
bbb|} in
let b = {|aaa
bbb
ccc|} in
let expected = {|--- a
+++ b
@@ -2,1 +2,2 @@
-bbb
\ No newline at end of file
+bbb
+ccc
\ No newline at end of file
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_no_nl_their_nl () =
let a = {|aaa
bbb|} in
let b = {|aaa
bbb
ccc
|} in
let expected = {|--- a
+++ b
@@ -2,1 +2,2 @@
-bbb
\ No newline at end of file
+bbb
+ccc
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_nl_their_no_nl () =
let a = {|aaa
bbb
|} in
let b = {|aaa
bbb
ccc|} in
let expected = {|--- a
+++ b
@@ -3,0 +3,1 @@
+ccc
\ No newline at end of file
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let print_diff_mine_nl_their_nl () =
let a = {|aaa
bbb
|} in
let b = {|aaa
bbb
ccc
|} in
let expected = {|--- a
+++ b
@@ -3,0 +3,1 @@
+ccc
|} in
let actual = Format.asprintf "%a" Patch.pp (Option.get (Patch.diff (Some ("a", a)) (Some ("b", b)))) in
Alcotest.(check string) __LOC__ expected actual
let diff_print = [
"mine empty their no-nl", `Quick, print_diff_mine_empty_their_no_nl;
"mine empty their nl", `Quick, print_diff_mine_empty_their_nl;
"mine no-nl their empty", `Quick, print_diff_mine_no_nl_their_empty;
"mine nl their empty", `Quick, print_diff_mine_nl_their_empty;
"mine no-nl their no-nl", `Quick, print_diff_mine_no_nl_their_no_nl;
"mine no-nl their nl", `Quick, print_diff_mine_no_nl_their_nl;
"mine nl their no-nl", `Quick, print_diff_mine_nl_their_no_nl;
"mine nl their nl", `Quick, print_diff_mine_nl_their_nl;
]
let tests = [
"parse", parse_diffs ;
"apply", apply_diffs ;
"multiple", multi_diffs ;
"filename", filename_diffs ;
"regression basic", basic_regression_diffs ;
"parse real diffs", parse_real_diff_headers ;
"regression", regression_diffs ;
"diff", unified_diff_creation ;
"patch -p", patch_p;
"pretty-print filenames", pp_filenames;
"big diff", big_diff;
"diff and print", diff_print;
]
let () =
Alcotest.run "Patch tests" tests
|