Commit Briefs

Stefan Sperling

make merge_file() accept FILEs instead of paths for orig and deriv inputs

diff | patch | tree

Stefan Sperling

fix 3-way merge of files which lack a final \n

problem found by jrick ok millert

diff | patch | tree

Stefan Sperling

use Myers diff instead of Patience diff when merging files with diff3

Myers diff tends to divide files into smaller diff chunks, while Patience diff attemps to maximize the size of diff chunks. Smaller diffs chunks generally result in a more managable presentation of merge conflicts.

diff | patch | tree

Stefan Sperling

make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere

ok millert, naddy

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

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

Stefan Sperling

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

diff | patch | tree

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

Stefan Sperling

fix build on sparc64 (uninitialized variable)

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

remove pointless attempt of unlinking temporary file name template paths

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree