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 /Makefile | |
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 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1838,7 +1838,7 @@ ifndef NO_CURL GIT_OBJS += http.o http-walker.o remote-curl.o endif XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \ - xdiff/xmerge.o xdiff/xpatience.o + xdiff/xmerge.o xdiff/xpatience.o xdiff/xhistogram.o VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \ vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \ |