Commits
- Commit:
34570dbeba22613374809c75a8ed2f119db01ec5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initialize to NULL instead of ""; allows pointer check to see if file is mapped
- Commit:
ad5b3f855591bc548f15e09ae4b7fdf674f16245
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
rename diff_atom->d to diff_atom->root, because it always is
The idea was that for each diff box within the files, the atoms would have a
backpointer to the current layer of diff_data (indicating the current section),
but it is not actually needed to update the backpointer in each atom to the
current diff_data. That is why the current code always points atom->d to the
root diff_data for the entire file. Clarify by proper name.
Constructs like atom->d->root->foo are redundant, just use atom->root->foo.
- Commit:
746d94dfa3a4c965501cde5bb0a59a168cc2ab44
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff_main: don't run algo if left or right are empty
- Commit:
acfce337ad1e68d4ab00bd78bdb6dd459acc3c46
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug: fix logging first chunk
- Commit:
e5447b812ab13381bef489dc01804c25cc226cd6
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff_algo_none: cosmetics
- Commit:
9dc0554fce377600fe0ce54848f2e735902616b6
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
fix diff_algo_none() for ending in plus chunk
- Commit:
93f8150ade45bb6185afe5b5ff3110db6403f8b3
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
results: also combine chunks coming from temp_chunks
- Commit:
13497fffa978aafa3c52c4b4922ba184de87bcf0
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
fix diff_algo_none(): no NULL pointers for left_start and right_start
- Commit:
724967e914b1604b54fab356ad4ce6c0feae2358
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff_state_add_chunk(): fix adding minus above plus chunk: wrong idx
- Commit:
bb867e685c9179eca1eb5b49c9a09b6e837baa28
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug tweaks for diff_state_add_chunk()
- Commit:
2146cf12c5afb7faa0de37de5465f09b6b604ce5
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff_algo_none(): also detect equal lines at the end
- Commit:
41ff30f35eb8d2ee0688753ce9be23cb2727b92a
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
cosmetic: diff_algo_none(): rename to equal_lines_start
- Commit:
467a993dc1da672ac3093104cbeae0dc22f978f9
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
cosmetic: diff_algo_none: local pointers for shorter code
- Commit:
1dfba0555efd6b616811906d011f96945be90dcc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move headers from include/diff/ to include/; makes things easier for consumers
- Commit:
2a1b94d029d73b14949971a9f159da4670584ee9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
repair DEBUG build
- Commit:
00d5652be692793aa7c9285b490702d05a7ab8df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
convert 'ignore_whitespace' boolean into a more general flags argument
- Commit:
85ab45596727cfd0254c6d5b6f0c5705b7b6e89e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move some definitions from the public diff_main.h to an internal header file
- Commit:
05b5f01fe731ec1197dbb90d6b0c98cd7dd3b465
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix segfault which occurred with empty input files
- Commit:
7a54ad3ae5d25aa5349668c8d3d3fa048a8f0733
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use buffered stdio if falling back on file i/o; this is much faster
- Commit:
009611347562f3a497a44c36a135deb5f7182335
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reduce default diff-box recursion depth from 1024 to 32
- Commit:
e4464189bc895121565a7a02eef98262343e6e24
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename 'debug.h' to 'diff_debug.h'
- Commit:
732e8ee0325715558a17b919a7f6a16bf64d66e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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'
- 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:
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