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>
This commit is contained in:

committed by
Junio C Hamano

parent
348ae56cb2
commit
d9c66f0b5b
7
range-diff.h
Normal file
7
range-diff.h
Normal file
@ -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
|
Reference in New Issue
Block a user