aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2022-12-13xdiff: mark unused parameter in xdl_call_hunk_func()Jeff King1-1/+1
2022-12-13xdiff: drop unused parameter in def_ff()Jeff King1-2/+2
2022-08-20xdiff: drop unused mmfile parameters from xdl_do_patience_diff()Jeff King3-19/+9
2022-08-19xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()Jeff King3-5/+3
2022-07-08xdiff: introduce XDL_ALLOC_GROW()Phillip Wood4-16/+33
2022-07-08xdiff: introduce XDL_CALLOC_ARRAY()Phillip Wood4-14/+11
2022-07-08xdiff: introduce xdl_callocPhillip Wood4-24/+15
2022-07-08xdiff: introduce XDL_ALLOC_ARRAY()Phillip Wood4-7/+12
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano3-3/+3
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano3-3/+3
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano3-3/+3
2022-04-01xdiff/xmacros.h: remove unused XDL_PTRFREEÆvar Arnfjörð Bjarmason1-1/+0
2022-02-16xdiff: handle allocation failure when mergingPhillip Wood1-1/+6
2022-02-16xdiff: refactor a functionPhillip Wood1-19/+16
2022-02-16xdiff: handle allocation failure in patience diffPhillip Wood1-5/+12
2022-02-16xdiff: fix a memory leakPhillip Wood3-23/+17
2021-12-21Merge branch 'pw/xdiff-classify-record-in-histogram'Junio C Hamano3-42/+29
2021-12-04xdiff: drop unused flags parameter from recs_matchJeff King1-9/+9
2021-12-04xdiff: drop xpparam_t parameter from histogram cmp_recs()Jeff King1-3/+2
2021-12-04xdiff: drop CMP_ENV macro from xhistogramJeff King1-3/+0
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2-6/+58
2021-11-18xdiff: simplify comparisonPhillip Wood1-4/+1
2021-11-18xdiff: avoid unnecessary memory allocationsPhillip Wood1-4/+7
2021-11-18diff histogram: intern stringsPhillip Wood2-19/+10
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2-1/+3
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Junio C Hamano1-14/+8
2021-06-08xdiff: use BUG(...), not xdl_bug(...)Ævar Arnfjörð Bjarmason1-14/+8
2021-05-14Merge branch 'pw/patience-diff-clean-up'Junio C Hamano1-11/+3
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2-1/+3
2021-05-05patience diff: remove unused variablePhillip Wood1-3/+0
2021-05-05patience diff: remove unnecessary string comparisonsPhillip Wood1-8/+3
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień2-2/+49
2020-10-20merge-base, xdiff: zero out xpparam_t structuresMichał Kępień2-0/+4
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano1-0/+17
2019-12-05xdiff: unignore changes in function contextRené Scharfe1-0/+17
2019-10-09xdiffi: fix typos and touch up commentsJohannes Schindelin1-44/+55
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano3-8/+0
2019-07-29Merge branch 'jk/xdiff-clamp-funcname-context-index'Junio C Hamano1-2/+2
2019-07-28xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón1-4/+0
2019-07-23xdiff: clamp function context indices in post-imageJeff King1-2/+2
2019-04-12xdiff: use xmalloc/xreallocJeff King1-2/+2
2019-04-12xdiff: use git-compat-utilJeff King1-7/+1
2018-11-02xdiff: provide a separate emit callback for hunksJeff King2-5/+22
2018-08-17Merge branch 'sb/indent-heuristic-optim'Junio C Hamano1-1/+11
2018-08-15Merge branch 'sb/histogram-less-memory'Junio C Hamano1-55/+78
2018-08-01xdiff: reduce indent heuristic overheadStefan Beller1-1/+11
2018-07-23xdiff/histogram: remove tail recursionStefan Beller1-6/+14
2018-07-19xdiff/xhistogram: move index allocation into find_lcsStefan Beller1-43/+53
2018-07-19xdiff/xhistogram: factor out memory cleanup into free_index()Stefan Beller1-4/+9
2018-07-19xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffStefan Beller1-11/+11
2018-07-17xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller1-17/+0
2018-07-17xdiff/xdiff.h: remove unused flagsStefan Beller1-8/+0
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano2-5/+41
2017-11-28Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano1-3/+10
2017-11-28diff: support anchoring line(s)Jonathan Tan2-5/+41
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2-12/+52
2017-11-21xdiff: show non-empty lines before functions with -WRené Scharfe1-0/+3
2017-11-21xdiff: factor out is_func_rec()René Scharfe1-3/+7
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger14-28/+28
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano2-3/+39
2017-10-27xdiff: reassign xpparm_t.flags bitsJunio C Hamano1-10/+14
2017-10-10cleanup: fix possible overflow errors in binary searchDerrick Stolee1-1/+1
2017-01-15xdiff -W: relax end-of-file function detectionVegard Nossum1-8/+6
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2-35/+1
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano2-35/+1
2016-12-06xdiff: drop XDL_FAST_HASHJeff King1-106/+0
2016-10-03Merge branch 'mh/diff-indent-heuristic'Junio C Hamano1-7/+7
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano1-1/+1
2016-09-27xdiff: rename "struct group" to "struct xdlgroup"Jeff King1-7/+7
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2-98/+538
2016-09-21Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano1-1/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty2-0/+326
2016-09-14xdiff: fix merging of hunks with -W context and -u contextRené Scharfe1-1/+1
2016-09-07xdiff: remove unneeded declarationsStefan Beller1-9/+0
2016-08-23xdl_change_compact(): introduce the concept of a change groupMichael Haggerty1-90/+203
2016-08-23recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty1-7/+7
2016-08-23is_blank_line(): take a single xrecord_t as argumentMichael Haggerty1-4/+4
2016-08-23xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty1-19/+19
2016-08-23xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty1-0/+1
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2-3/+5
2016-07-11diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin2-3/+5
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano1-8/+57
2016-06-20Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano1-8/+57
2016-06-09xdiff: fix merging of appended hunk with -WRené Scharfe1-1/+2
2016-05-31xdiff: -W: don't include common trailing empty lines in contextRené Scharfe1-0/+2
2016-05-31xdiff: ignore empty lines before added functions with -WRené Scharfe1-2/+20
2016-05-31xdiff: handle appended chunks better with -WRené Scharfe1-3/+24
2016-05-31xdiff: factor out match_func_rec()René Scharfe1-4/+11
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2-4/+38
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller2-0/+28
2016-04-18xdiff: add recs_match helper functionJacob Keller1-4/+10
2016-04-03Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano1-1/+2
2016-03-04xdiff/xprepare: fix a memory leakRamsay Jones1-0/+1
2016-03-04xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones1-1/+1
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano1-2/+7
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano2-19/+0
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt1-2/+7
2016-02-22xdiff: drop XDL_EMIT_COMMONJeff King2-19/+0
2016-01-27merge-file: ensure that conflict sections match eol styleJohannes Schindelin1-14/+23
2016-01-27merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin1-4/+57
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov1-2/+2
2013-10-16C: have space around && and || operatorsJunio C Hamano1-1/+1
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse7-8/+89
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini2-2/+2
2012-05-25Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano1-15/+15
2012-05-23xdiff: import new 32-bit version of count_masked_bytes()René Scharfe1-13/+5
2012-05-23xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe1-1/+7
2012-05-22xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe1-3/+5
2012-05-09xdiff: remove unused functionsRené Scharfe2-46/+0
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2-6/+1
2012-05-09xdiff: add hunk_func()René Scharfe2-0/+22
2012-05-02Merge branch 'tr/xdiff-fast-hash'Junio C Hamano1-0/+106
2012-05-01xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZEThomas Rast1-29/+23
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano5-21/+18
2012-04-09xdiff: load full words in the inner loop of xdl_hash_recordThomas Rast1-0/+112
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano5-16/+18
2012-02-19xdiff: remove XDL_PATCH_* macrosJunio C Hamano1-5/+0
2012-01-29Merge branch 'rs/diff-postimage-in-context'Junio C Hamano1-6/+6
2012-01-06xdiff: print post-image for common records instead of pre-imageRené Scharfe1-6/+6
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano2-16/+70
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano1-3/+7
2011-10-10diff: add option to show whole functions as contextRené Scharfe2-6/+49
2011-10-10xdiff: factor out get_func_line()René Scharfe1-16/+27
2011-09-26Revert removal of multi-match discard heuristic in 27af01René Scharfe1-3/+7
2011-09-06Merge branch 'rc/histogram-diff'Junio C Hamano1-0/+2
2011-08-31xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan1-0/+2
2011-08-17Merge branch 'rc/histogram-diff' into HEADJunio C Hamano8-125/+470
2011-08-17xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan1-36/+50
2011-08-08xdiff/xhistogram: drop need for additional variableTay Ray Chuan1-5/+4
2011-08-08xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan1-27/+4
2011-08-08xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan1-6/+9
2011-08-03xdiff: do away with xdl_mmfile_next()Tay Ray Chuan3-20/+2
2011-07-12xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan3-10/+17
2011-07-12xdiff/xprepare: skip classificationTay Ray Chuan1-8/+16
2011-07-12teach --histogram to diffTay Ray Chuan4-0/+390
2011-07-07xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan3-25/+35
2011-07-07xdiff/xprepare: refactor abort cleanupsTay Ray Chuan1-59/+32
2011-07-07xdiff/xprepare: use memset()Tay Ray Chuan1-7/+3
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano1-24/+14
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder3-10/+11
2010-09-30diff: avoid repeated scanning while looking for funcnameRené Scharfe1-24/+14
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid1-1/+3
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin1-9/+8
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2-10/+14
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2-2/+15
2010-03-02refactor merge flags into xmparam_tBert Wesarg2-12/+11
2010-03-02make union merge an xdl merge favorBert Wesarg2-7/+14
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano2-10/+25
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2-2/+7
2009-11-29git-merge-file --ours, --theirsJunio C Hamano2-3/+14
2009-08-31Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano1-33/+53
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano1-31/+49
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano1-2/+4
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit1-1/+1
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano1-16/+15
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey1-16/+15
2009-04-22Fix typos / spelling in commentsMike Ralphson1-1/+1
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer2-4/+3
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano1-2/+4
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano5-1/+389
2009-01-21Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano1-2/+4
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio1-2/+4
2009-01-07Implement the patience diff algorithmJohannes Schindelin5-1/+389
2008-12-29diff: add option to show context between close hunksRené Scharfe2-1/+3
2008-12-02xdiff: give up scanning similar lines earlyDavide Libenzi1-2/+13
2008-11-12Merge branch 'dl/xdiff'Junio C Hamano1-2/+13
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi1-2/+13
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing4-3/+8
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano1-0/+9
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano1-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2-19/+90
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano1-51/+70
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2-4/+28
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin1-1/+46
2007-11-15Remove unreachable statementsGuido Ostkamp2-4/+0
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano2-14/+27
2007-06-08Missing statics.Pierre Habouzit1-2/+2
2007-06-07War on whitespaceJunio C Hamano12-12/+0
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin1-2/+20
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin2-1/+26
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin1-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin1-0/+4
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano1-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin1-16/+5
2006-12-04diff -b: ignore whitespace at end of lineJohannes Schindelin1-1/+2
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin1-5/+5
2006-12-02xmerge: make return value from xdl_merge() more usable.Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Johannes Schindelin4-2/+442
2006-11-23Increase length of function name bufferAndy Parkins1-1/+1
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis1-2/+1
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering1-1/+1
2006-10-16Merge branch 'maint'Junio C Hamano1-2/+3
2006-10-16Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds1-2/+3
2006-10-12diff: fix 2 whitespace issuesJohannes Schindelin1-17/+12
2006-07-12Merge branch 'lt/merge-tree'Junio C Hamano2-0/+19
2006-07-10Fix more typos, primarily in the codePavel Roskin1-3/+3
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 11:21:22 +0000