Commits
- Commit:
70fb5a47142d240e33700b734a57433248225624
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff_myers: fix some uninitialized warnings
- Commit:
65688edf4c58356b6a78c043dae1a4832532b84f
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
patience: fix uninitialized rc in diff_atoms_qsort_compar
- Commit:
2c12b171fbb19e2b5423c046fbb9cb86b60632eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -Wuninitialized to CFLAGS on Linux build; exposes some bugs already
- Commit:
99193dbfc9c01d4924eae992a6819d0bb998f2c8
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add test for -T option
This uncovered a bug in diff_algo_none(), so let's keep it.
- Commit:
6c8c5d3f0b6b2ba6c23acd67179fd37e8f2af66b
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
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).
- Commit:
c8846eb959c22c43dd5f8d9193b7e0c83c31b8af
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add patience tests
- Commit:
23f98e9b0c9c2f60bedc24f6d1ae19e2d2ea880a
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
test/verify_all.sh: allow combined cmdline opts
- Commit:
60b6e08bf7113461bbe0ce511caf96a31121b143
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
patience: use qsort to optimize finding unique lines
- 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:
65a56b169e5746c2fe2ee46008238505c64e4908
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
diff: drop -p, add -P -Q -T; diffreg(): use algo enum
-p is traditionally used for "show which C function each change is in", so
don't use it for choosing Patience.
Instead add two options for using Patience, -P for only Patience and -Q to
attempt forward-Myers first.
Also add -T for a trivial diff (diff_algo_none).
- Commit:
93965884a1452f6e1f50fb33a0395448fbd8b3bd
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
test: add expect0{10,11,12,14}.diff
- 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:
7de1313c10a6f5e52023b7dcb1be4b81dee28065
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore compiled files in all directories
- Commit:
384c09ad050cd3a8820e106c064291b7230e7710
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix missing newline in ed script diff output
- Commit:
4f58e89131e0c8121fb717405a07decd66d5d474
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make the C tests compile and run on both OpenBSD and Linux
- Commit:
e14ee64c985996cc77c97f6af5c5fcc6379622fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove arraylist_test during 'gmake clean'
- Commit:
eac85e68ef06b8c5a9748b11feb987b5aa6db781
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename GNU-make-specific Makefile to GNUmakefile
- Commit:
548d9762027d1b13465dc36e0f7c1b591db6d363
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
verify_all.sh: run all tests, then list all errors
- Commit:
3e6df9167632c7a43900965b3e2e81b47629bb40
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
run C tests in verify_all.sh
- Commit:
3e66d05b2cdeea5b72b2ee7c116f5dd0cdd1c270
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add arraylist_test
- Commit:
87c313418265b477d8931182e8e9e0990db4f3ba
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
add results_test.c
- Commit:
93f8150ade45bb6185afe5b5ff3110db6403f8b3
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
results: also combine chunks coming from temp_chunks