Commit Briefs

Stefan Sperling

switch 'tog diff' and 'tog blame' to Myers diff for speed

Make the choice of diff algorithm configurable by diff API users. The got and gotweb programs keep using Patience diffs which are prettier than Myers. But tog should be as fast as possible since it is being used interactively. If performance of Patience diff gets improved later we can consider switching tog back over to it. ok tracey jamsek

diff | patch | tree

Stefan Sperling

move more opentemp out of diffreg.c

ok tracey

diff | patch | tree

Stefan Sperling

inline struct got_object_id in struct got_object_qid

Saves us from doing a malloc/free call for every item on the list. ok op@

diff | patch | tree

Stefan Sperling

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

ok millert, naddy

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

allow for configuring a custom file atomizer with got_diff_get_config()

diff | patch | tree

Stefan Sperling

remove unused function got_diffreg_prepared_files()

diff | patch | tree

Stefan Sperling

simply got_diff_prepare_file() by letting callers worry about file creation

diff | patch | tree

Stefan Sperling

remove unused empty function got_diff_dump_change()

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

avoid creating empty files when one side of a diff is empty; ok tracey

diff | patch | tree

Tracey Emery

create temporary workaround to opening /dev/null during diffing.

this will need to be reworked later. ok stsp

diff | patch | tree

Stefan Sperling

Add missing includes for time() and ctime()

These headers were implicitly used on OpenBSD, but building on Linux revealed that <time.h> wasn't included directly. diffreg.c uses ctime(), which additionally needs <sys/types.h>.

diff | patch | tree

Stefan Sperling

Remove return value from diffreg's fetch()

The last use of this was removed in 0165cdf03ffac4c24334979832ad27554913d54c over a year ago.

diff | patch | tree

Stefan Sperling

Remove unused variable in diffreg's fetch()

diff | patch | tree

Stefan Sperling

remove unused 'oldfile' parameter from diffreg.c's fetch()

diff | patch | tree

Stefan Sperling

initial 'got stage -p' implementation

diff | patch | tree

Stefan Sperling

remove accidental assignment in diffreg.c

diff | patch | tree

Stefan Sperling

plug /dev/null file descriptor leaks in diffreg.c

diff | patch | tree

Stefan Sperling

rename got_error_prefix_errno() to got_error_from_errno()

diff | patch | tree

joshua stein

got_error_from_errno -> got_error_prefix_errno

also add got_error_prefix_errno2 and got_error_prefix_errno3 which should hopefully all be merged into a single function with variadic args (but can't alloc mem)

diff | patch | tree

Stefan Sperling

don't close input files in got_diffreg(); callers will do that

diff | patch | tree

Stefan Sperling

check for errors from fclose()

diff | patch | tree

Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree