diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2011-07-12 14:10:25 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-12 09:29:20 -0700 |
| commit | 8c912eea94a2138e8bc608f7c390eb0b313effb0 (patch) | |
| tree | 244d67eaac3f77d6645bdf69b87e23a90dbb2485 /xdiff/xdiff.h | |
| parent | 46c8f2988dc9a6012babd5833a6245ceff214483 (diff) | |
| download | git-8c912eea94a2138e8bc608f7c390eb0b313effb0.tar.gz | |
teach --histogram to diff
Port JGit's HistogramDiff algorithm over to C. Rough numbers (TODO) show
that it is faster than its --patience cousin, as well as the default
Meyers algorithm.
The implementation has been reworked to use structs and pointers,
instead of bitmasks, thus doing away with JGit's 2^28 line limit.
We also use xdiff's default hash table implementation (xdl_hash_bits()
with XDL_HASHLONG()) for convenience.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 711048ea36..c26170ce5e 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -33,6 +33,7 @@ extern "C" { #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) #define XDF_PATIENCE_DIFF (1 << 5) +#define XDF_HISTOGRAM_DIFF (1 << 6) #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) #define XDL_PATCH_NORMAL '-' |