summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2011-07-12 14:10:25 +0800
committerJunio C Hamano <gitster@pobox.com>2011-07-12 09:29:20 -0700
commit8c912eea94a2138e8bc608f7c390eb0b313effb0 (patch)
tree244d67eaac3f77d6645bdf69b87e23a90dbb2485 /diff.c
parent46c8f2988dc9a6012babd5833a6245ceff214483 (diff)
downloadgit-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 'diff.c')
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 61bedaed57..1b940ee72e 100644
--- a/diff.c
+++ b/diff.c
@@ -3369,6 +3369,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
else if (!strcmp(arg, "--patience"))
DIFF_XDL_SET(options, PATIENCE_DIFF);
+ else if (!strcmp(arg, "--histogram"))
+ DIFF_XDL_SET(options, HISTOGRAM_DIFF);
/* flags options */
else if (!strcmp(arg, "--binary")) {