Commits
- Commit:
cd25827e24b8fad0a3f4a89b72fbdba86bc2c5d1
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
myers_divide: stop traversing snakes after reasonable max effort
- Commit:
8546b0450f31c11e9433f5d5c6dc1d79c86107ed
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff result: ensure sane order of result chunks
Ensure that a adjacent chunks of same type are combined, and that a minus block
always precedes an adjacent plus block.
The upcoming myers-divide optimization is prone to produce weird ordering of
plus and minus chunks.
- Commit:
2c8a57df59d1b63727c21ec367fdd2a091392d0c
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add ARRAYLIST_INSERT()
- Commit:
44cf49504c18b4bb2edd3518b6e1192b5e4f4416
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
patience: error handling from diff_atoms_same()
- Commit:
ac2eeeffef0b2071f39513685c4b6d594a30416d
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
myers: error handling from diff_atoms_same()
- Commit:
b3fb46867c2efc085c584bd336b9dca9cf26a161
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add diff_atom_cmp() and error handling to diff_atom_same()
- Commit:
e10a628aa1d46df600ffc7194d35f67416eaefdd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid include statements in header files; make each .c pull in what's needed
- Commit:
3e6cba3a54789e151b37851eef9cdccc4180ae40
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
replace enum diff_rc errors with plain errno values
- Commit:
80b447444e135e42383c31acf4e452fefbd6ecad
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix build with 'make PROFILE=1' on OpenBSD
- Commit:
c6eecea3241f36efced72dc3b7c5b023c89e1c4a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fall back on file i/o in case an input file cannot be memory-mapped
- Commit:
d362ea2e854f8c315f7f54d125439540e0649383
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move 'struct range' and related functions into the diff_ namespace
no functional change
- Commit:
ab699b5cc3fb94b67d92e8c8a90535a94f99f30b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong assignment in diff_atoms_swallow_identical_neighbors; ok neels
- Commit:
0d27172a828e5ff3c6457cbf0d36a88c9bd8e370
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
KNF: use max 80 columns
- Commit:
61a7b57805472a03ad39d7bf4ef6d705eb0ccac2
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
KNF: function declaration return types on separate line
- Commit:
760fe30eb1f6351170157beaae12a0ca0c2698a9
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff cmdline tool: allow using Patience by -p arg
- Commit:
a45330b1527e02e1627af02b55831f4cdf8794b4
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
fix myers divide: properly trigger division on single midpoints
- Commit:
b47897f387d8f7e9152f0b0e1b1d5548c7bab6f2
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add test012
test010 has a weird failure to find a good diff. This new test, when setting
the permitted_state_size = 100, gives a shorter failure that test010, to allow
easier debugging.
- Commit:
c5419a0537f77645e9b527a1fa97c2d7c2ecead9
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug: myers divide: log nr of identical lines slid over
- Commit:
f71e8098324d6de96d593537a80b348d7f032e4d
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
fix diff_algo_myers_divide's finding of midpoints
When forwards and backwards traversals meet, the endpoints of the mid-snake are
not the two points in kd_forward and kd_backward, but rather the section that
was slid (if any) of the current forward/backward traversal only.
For example:
o-o-o
| |
o A
| \
o o
\
M
|\
o o-o-o
| | |
o o X
\
o
\
o
\
o
The backward traversal reached M from the bottom and slid upwards.
The forward traversal already reached X, which is not a straight line from M
anymore, so picking a mid-snake from M to X would yield a mistake.
The correct mid-snake is between M and A. M is where the bottom traversal hit
the diagonal that the forwards traversal has already passed, and A is what it
reaches when sliding up identical lines.
- Commit:
50198b5f2f9c8dd7d1deefed0fa25cabbf2af92f
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug: myers graph dump tweaks
In debug output:
fix some indents,
fix printing of max state size,
in myers graph, limit x axis labels to 2 digits,
print colored markers of current myers graph positions,
also print myers-divide positions in myers graph.
- Commit:
09c9539493a3f69ab1c1e259ef4c8ea22e57f906
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
comment tweak
- Commit:
f8cbb8fea02ccfaa3581f70556d4670b88ce2b0d
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
remove code dup of diff_main() invocation for plain vs unidiff
- Commit:
501e780790ed4cd0aa9e3404e28e0204de28c9fc
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add test010, test011
- Commit:
a5cbcf9c3cc6d3acdf73a4c8a1075b1ebd417fb8
- From:
- Martin Pieuchot <mpi@openbsd.org>
- Via:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
Only print (unified) header in unified format.
- Commit:
9dabce8a40d592a5f30843b4cacede063f7e7f56
- From:
- Martin Pieuchot <mpi@openbsd.org>
- Via:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
Remove unused `arbitrary_info'.