Commit Briefs

810479a563 Stefan Sperling

sync diff_patience.c from got.git 336075a42a5ae0fa322db734c481d21998e82bb8

diff | patch | tree

86b603da30 Neels Hofmeyr

patience: do not swallow identical neighbors

This does not make much sense, because if common-unique lines swallow their neighboring ones, they count less, and another bad, shorter sequence may gain more weight than a very long sequence that was combined to just one common-unique chunk. It also much simplifies the code and avoids bugs we had to implement complex fixes for before.

diff | patch | tree

fe6d58fb52 Christian Weisgerber

add a missing include for uint8_t and switch from <inttypes.h> to <stdint.h>

ok millert stsp

diff | patch | tree

ab378e1f5d Stefan Sperling

fix patience diff assertion failure exposed by test122

diff | patch | tree

6715724815 Neels Hofmeyr

fix patience: off-by-one preventing swallow the same identical line twice

diff | patch | tree

ae2763e9e2 Neels Hofmeyr

fix patience crash: iron out overlapping identical-blocks on the right

diff | patch | tree

46093fc37f Neels Hofmeyr

remove stray blank line

diff | patch | tree

10ae3a6560 Neels Hofmeyr

patience debug

diff | patch | tree

a5de263314 Neels Hofmeyr

patience comments

diff | patch | tree

9f9e0ab43b Neels Hofmeyr

cosmetic: patience: use local var 'r' for right atom

diff | patch | tree

ca1af24580 Neels Hofmeyr

cosmetic: rename local var from 'r' to 'rc'

diff | patch | tree

1c7f8717f7 Neels Hofmeyr

patience: use qsort

diff | patch | tree

72e4a018d5 Neels Hofmeyr

patience: optimize: less diff_atom_cmp() via hash

diff | patch | tree

123481a5f4 Neels Hofmeyr

fix patience iteration error; also makes dramatically faster

diff | patch | tree

49307efefc Neels Hofmeyr

debug: patience: mark unique debug

diff | patch | tree

ca6fcbdce0 Neels Hofmeyr

patience: make it easy to switch impls for mark_unique

diff | patch | tree

b229234e62 Stefan Sperling

fix missing allocaion failure check in diff_algo_patience()

diff | patch | tree

12c5bde7b2 Stefan Sperling

use mergesort(3) instead of qsort(3) in patience diff

Fixes test failures on OpenBSD due to unstable results of qsort if two or more elements are equal. Add a compat copy of OpenBSD mergesort(3) for Linux.

diff | patch | tree

f087e96869 Stefan Sperling

check for allocation failure in diff_atoms_mark_unique_in_both_by_qsort()

diff | patch | tree

227cd87e53 Stefan Sperling

wrap a comment that had overlong lines

diff | patch | tree

65688edf4c Neels Hofmeyr

patience: fix uninitialized rc in diff_atoms_qsort_compar

diff | patch | tree

6c8c5d3f0b Neels Hofmeyr

move patience data out of struct diff_atom

Now allocating patience specific data only when patience is going to be used. This may allow using forward-Myers more often, since the state size per line is significantly smaller. Patience instead allocates an array, puts it in the current diff_data, and also place a pointer of the current diff_data in the root diff_data (since each atom points to the root diff_data).

diff | patch | tree

60b6e08bf7 Neels Hofmeyr

patience: use qsort to optimize finding unique lines

diff | patch | tree

1dfba0555e Stefan Sperling

move headers from include/diff/ to include/; makes things easier for consumers

diff | patch | tree

2a1b94d029 Stefan Sperling

repair DEBUG build

diff | patch | tree