Commits


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


move more opentemp out of diffreg.c ok tracey


move got_opentempfd() out of lib/diff.c again ok tracey


build with -Wwrite-strings Throwing this into the mix for a while, we can always get rid of it again if it becomes annoying. No objections from stsp@


move creation of tempfiles outside of lib/diff.c ok tracey


implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@


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


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.


show a list of paths changed in a commit with 'got log -P', and in tog requested by matthieu@


show file mode differences when diffing trees


add -w (ignore whitespace) option to 'got diff'


label staged blobs with "(staged)" in got diff output


speed up rebase and histedit path prefix check: skip blob content diffs


generalize got_diff_tree() by adding a diff output callback


whitespace formatting fixes in include/