Fizzy apply

[anatawa12]

Closes #112

[wumpz]

Sorry. Fortgot about this patch. I will look into it.

[wumpz]

Could you first resolve the conflicts? Strangely I am not able to resolve it using Github.

[anatawa12]

Could you first resolve the conflicts? Strangely I am not able to resolve it using Github.

Yes. i'll resolve conflicts and add more documentation about fuzzy patch.

[cowwoc]

The new documentation look good to me. Thank you!

[wumpz]

Merged. Thx for the improvement. Could this something for the Wiki documentation?

[meteorcloudy]

We are using applyFuzzy in Bazel (see bazelbuild/bazel#17897), but it's leading to a problem of applying a clean patch with multiple chunks: kythe/kythe#5864

My debugging shows there is something wrong about calculating the defaultPosition at

java-diff-utils/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

Lines 108 to 115 in 281c073

	for (AbstractDelta<T> delta : getDeltas()) {
	ctx.defaultPosition = delta.getSource().getPosition() + lastPatchDelta;
	int patchPosition = findPositionFuzzy(ctx, delta);
	if (0 <= patchPosition) {
	delta.applyFuzzyToAt(ctx.result, ctx.currentFuzz, patchPosition);
	lastPatchDelta = patchPosition - delta.getSource().getPosition();
	ctx.lastPatchEnd = delta.getSource().last() + lastPatchDelta;
	} else {

Do I understand correctly that lastPatchDelta means the offset we should apply to the next delta after applying the previous one? If so it probably should not be lastPatchDelta = patchPosition - delta.getSource().getPosition(); since the new chunk could be smaller.

The problematic patch I encountered is:

--- src/include/souffle/utility/FileUtil.h
+++ src/include/souffle/utility/FileUtil.h
@@ -20,23 +20,16 @@
 #include <climits>
 #include <cstdio>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 #include <map>
-#include <optional>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <sys/stat.h>

-// -------------------------------------------------------------------------------
-//                               File Utils
-// -------------------------------------------------------------------------------
-
 #ifndef _WIN32
 #include <unistd.h>
 #else
-#define NOMINMAX
 #define NOGDI
 #include <fcntl.h>
 #include <io.h>
@@ -44,11 +37,21 @@
 #include <windows.h>

 // -------------------------------------------------------------------------------
-//                               Windows
+//                               File Utils
 // -------------------------------------------------------------------------------

+#define X_OK 1 /* execute permission - unsupported in windows*/
+
 #define PATH_MAX 260

+/**
+ * access and realpath are missing on windows, we use their windows equivalents
+ * as work-arounds.
+ */
+inline int access(const char* path, int mode) {
+    return _access(path, mode);
+}
+
 inline char* realpath(const char* path, char* resolved_path) {
     return _fullpath(resolved_path, path, PATH_MAX);
 }

on https://github.com/souffle-lang/souffle/tree/cc8ea091721fcfb60bed45a0edf571ad9d0c58a5/src/include/souffle/utility/FileUtil.h