3-way merge with Myers diff
pus: rename test_ functions, fix service_type doc (merlint E330/E410)
+10
-21
+1
-2
bench/bench.ml
+1
-2
bench/bench.ml
···
91
91
()
92
92
done;
93
93
let elapsed = Unix.gettimeofday () -. t0 in
94
-
Fmt.pr "Total: %.3fs (%.3fs/merge)\n" elapsed
95
-
(elapsed /. float_of_int runs);
94
+
Fmt.pr "Total: %.3fs (%.3fs/merge)\n" elapsed (elapsed /. float_of_int runs);
96
95
Fmt.pr "Throughput: %.0f merges/s\n" (float_of_int runs /. elapsed)
+9
-19
test/interop/git/test.ml
+9
-19
test/interop/git/test.ml
···
263
263
lines :=
264
264
List.mapi
265
265
(fun i l ->
266
-
if i = idx then
267
-
Fmt.str "edited %d" (Random.State.int rng 1000)
266
+
if i = idx then Fmt.str "edited %d" (Random.State.int rng 1000)
268
267
else l)
269
268
!lines
270
269
| 1 ->
271
270
(* insert *)
272
-
let new_l =
273
-
Fmt.str "inserted %d" (Random.State.int rng 1000)
274
-
in
271
+
let new_l = Fmt.str "inserted %d" (Random.State.int rng 1000) in
275
272
let rec ins i = function
276
273
| [] -> [ new_l ]
277
274
| l :: rest when i = idx -> new_l :: l :: rest
···
326
323
Alcotest.test_case "modifies" `Quick non_overlapping_modifies;
327
324
Alcotest.test_case "inserts" `Quick non_overlapping_inserts;
328
325
Alcotest.test_case "deletes" `Quick non_overlapping_deletes;
329
-
Alcotest.test_case "unrelated blocks" `Quick
330
-
modify_unrelated_blocks;
326
+
Alcotest.test_case "unrelated blocks" `Quick modify_unrelated_blocks;
331
327
] );
332
328
( "inserts",
333
329
[
334
-
Alcotest.test_case "ours inserts" `Quick
335
-
ours_inserts_theirs_unchanged;
330
+
Alcotest.test_case "ours inserts" `Quick ours_inserts_theirs_unchanged;
336
331
Alcotest.test_case "theirs inserts" `Quick
337
332
theirs_inserts_ours_unchanged;
338
333
Alcotest.test_case "both at start" `Quick both_insert_at_start;
···
343
338
Alcotest.test_case "same line" `Quick both_modify_same_line;
344
339
Alcotest.test_case "same block diff" `Quick
345
340
both_modify_same_block_differently;
346
-
Alcotest.test_case "overlapping inserts" `Quick
347
-
overlapping_inserts;
348
-
Alcotest.test_case "completely different" `Quick
349
-
completely_different;
341
+
Alcotest.test_case "overlapping inserts" `Quick overlapping_inserts;
342
+
Alcotest.test_case "completely different" `Quick completely_different;
350
343
] );
351
344
( "edge-cases",
352
345
[
353
346
Alcotest.test_case "empty base" `Quick empty_base;
354
-
Alcotest.test_case "no trailing newline" `Quick
355
-
no_trailing_newline;
356
-
Alcotest.test_case "whitespace only" `Quick
357
-
only_whitespace_changes;
347
+
Alcotest.test_case "no trailing newline" `Quick no_trailing_newline;
348
+
Alcotest.test_case "whitespace only" `Quick only_whitespace_changes;
358
349
Alcotest.test_case "single line" `Quick single_line_files;
359
350
] );
360
351
( "realistic",
361
352
[
362
-
Alcotest.test_case "ocaml function edits" `Quick
363
-
ocaml_function_edits;
353
+
Alcotest.test_case "ocaml function edits" `Quick ocaml_function_edits;
364
354
Alcotest.test_case "imports both sides" `Quick
365
355
imports_added_both_sides;
366
356
Alcotest.test_case "changelog" `Quick changelog_entries;