summaryrefslogtreecommitdiff
path: root/range-diff.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2018-08-13 11:33:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-13 17:44:50 (GMT)
commitd9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7 (patch)
treee955ac801228078a74f9de856dcb57bbd600da53 /range-diff.h
parent348ae56cb2266d3294611112ae0368386124d720 (diff)
downloadgit-d9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7.zip
git-d9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7.tar.gz
git-d9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7.tar.bz2
range-diff: first rudimentary implementation
At this stage, `git range-diff` can determine corresponding commits of two related commit ranges. This makes use of the recently introduced implementation of the linear assignment algorithm. The core of this patch is a straight port of the ideas of tbdiff, the apparently dormant project at https://github.com/trast/tbdiff. The output does not at all match `tbdiff`'s output yet, as this patch really concentrates on getting the patch matching part right. Note: due to differences in the diff algorithm (`tbdiff` uses the Python module `difflib`, Git uses its xdiff fork), the cost matrix calculated by `range-diff` is different (but very similar) to the one calculated by `tbdiff`. Therefore, it is possible that they find different matching commits in corner cases (e.g. when a patch was split into two patches of roughly equal length). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'range-diff.h')
-rw-r--r--range-diff.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/range-diff.h b/range-diff.h
new file mode 100644
index 0000000..7b6eef3
--- /dev/null
+++ b/range-diff.h
@@ -0,0 +1,7 @@
+#ifndef RANGE_DIFF_H
+#define RANGE_DIFF_H
+
+int show_range_diff(const char *range1, const char *range2,
+ int creation_factor);
+
+#endif