Commit Briefs

Stefan Sperling

rename 'debug.h' to 'diff_debug.h'



Stefan Sperling

add support for ignoring whitespace (-w option)

Tests grow the ability to call diff with options. Options to use are encoded in the test file name as a single dash followed by a string of option letters. E.g. -wp for 'ignore whitespace' and 'do patience'


Neels Hofmeyr

myers_divide: stop traversing snakes after reasonable max effort (neels/max_effort)


Neels Hofmeyr

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.


Neels Hofmeyr

add ARRAYLIST_INSERT()







Stefan Sperling

fix build with 'make PROFILE=1' on OpenBSD



Stefan Sperling

move 'struct range' and related functions into the diff_ namespace

no functional change



Neels Hofmeyr

KNF: use max 80 columns





Neels Hofmeyr

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.



Neels Hofmeyr

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.


Neels Hofmeyr

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.


Neels Hofmeyr

comment tweak