Commit Briefs

25ec70067d Thomas Adam

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


dd2e2f52c1 Thomas Adam

move more opentemp out of diffreg.c

ok tracey


89fe1c42b3 Thomas Adam

portable: fix-up sha1.h include

-portable doesn't need this directly.


9a267125aa Thomas Adam

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@


82f9484cc5 Thomas Adam

portable: include sha1.h portably

Don't directly include sha1.h as this isn't always in the same location across systems.


c17f3d0c7b Thomas Adam

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@


b0e25f642d Thomas Adam

portable: freebsd: portably include sha1

The SHA implementation is found portably across systems, so don't include sha1.h directly.


ec242592d3 Thomas Adam

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@


dd038bc6ec Thomas Adam

portable: initial Linux compilation

This commit modifies the GoT main branch to be able to compile it under linux.


56b63ca4ab Stefan Sperling

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

ok millert, naddy





24e87ea363 Stefan Sperling

remove unused function got_diffreg_prepared_files()



62ad13c507 Stefan Sperling

remove unused empty function got_diff_dump_change()


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.



ac9e7fddf6 Tracey Emery

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

this will need to be reworked later. ok stsp


303e14b5e9 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>.


83290b45b0 Stefan Sperling

Remove return value from diffreg's fetch()

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


8fbe07c208 Stefan Sperling

Remove unused variable in diffreg's fetch()


14ed98fdf9 Stefan Sperling

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


dc424a06a9 Stefan Sperling

initial 'got stage -p' implementation


3043f6a395 Stefan Sperling

remove accidental assignment in diffreg.c