Commit Briefs

16aeacf708 Stefan Sperling

use size_t for loop indices to avoid signedness warnings; from emaste@freebsd

diff | patch | tree

1cb46f007d Stefan Sperling

consistently label removed files as "/dev/null" in diff headers

diff | patch | tree

64453f7e55 Stefan Sperling

handle binary files in got/tog diff commands; add -a options to force text

diff | patch | tree

fe621944e8 Stefan Sperling

merge new diff implementation from the git.gameoftrees.org diff.git repository

This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.

diff | patch | tree

21c17f12d4 Stefan Sperling

fix merging with files that do not contain a newline character; ok millert@

diff | patch | tree

bb63914a95 Stefan Sperling

make tmp dir location a compile-time setting and change gotweb's tmp dir

We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD. Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.

diff | patch | tree

937e0e5871 Stefan Sperling

fix build on sparc64 (uninitialized variable) (tags/0.18)

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

d59c0cb27b Stefan Sperling

improve use of mixed size_t/off_t types in diff3.c's edscript()

diff | patch | tree

b2338effff Stefan Sperling

diff3.c: do not use the same variables for both line numbers and byte offsets

diff | patch | tree

887758148e Stefan Sperling

diff3.c's skip() returns number of bytes skipped so switch from int to size_t

diff | patch | tree

96cbb59708 Stefan Sperling

remove worklist code; it was only used to unlink files which we already unlink

diff | patch | tree

68bda3b1b9 Stefan Sperling

diff3.c: check for unlink errors and unlink dp13 and dp23 again

diff | patch | tree

9688d20ad6 Stefan Sperling

rename local variable in diff3.c's edscript() from j to len (not a loop index)

diff | patch | tree

9d4a5e899d Stefan Sperling

rename local variable in diff3.c's skip() from j to len (not a loop index)

diff | patch | tree

db33008019 Stefan Sperling

remove pointless attempt of unlinking temporary file name template paths

diff | patch | tree

e45311301f Stefan Sperling

do not leak open file in diff3.c's readin() error paths

diff | patch | tree

971405a7e4 Stefan Sperling

do not abuse d3s->fp[0] as a local variable in diff3.c's readin()

diff | patch | tree

50351dee7e Stefan Sperling

remove unused 'pr' argument from diff3.c's skip() function

diff | patch | tree

575e82180a Stefan Sperling

more mechanical conversions to struct got_error: buf_load() and buf_alloc()

diff | patch | tree

e19660d59f Stefan Sperling

some whitespace fixes in diff3.c

diff | patch | tree

346b301a61 Stefan Sperling

check for errors from buf_append() in diff3.c's diff_output()

diff | patch | tree

950435fdd3 Stefan Sperling

remove pointless debug code from diff3.c

diff | patch | tree

18b9ebab6e Stefan Sperling

eflag in diff3.c is hard-coded to 3; remove code for other cases

diff | patch | tree