include/got_diff.h

Branch


Log

Author Commit Date CI Message
Stefan Sperling 4b752015 2022-06-30T21:35:28 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
Stefan Sperling 49d4a017 2022-06-30T10:43:37 move more opentemp out of diffreg.c ok tracey
Stefan Sperling f9d37699 2022-06-28T20:33:41 move got_opentempfd() out of lib/diff.c again ok tracey
Omar Polo 58e31a80 2022-06-27T18:47:02 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@
Stefan Sperling b72706c3 2022-06-01T05:08:20 move creation of tempfiles outside of lib/diff.c ok tracey
Stefan Sperling 67b631c9 2021-10-10T15:22:14 implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@
Stefan Sperling 64453f7e 2020-11-21T13:35:00 handle binary files in got/tog diff commands; add -a options to force text
Stefan Sperling fe621944 2020-11-10T22:54:37 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.
Stefan Sperling 0208f208 2020-05-05T09:53:57 show a list of paths changed in a commit with 'got log -P', and in tog requested by matthieu@
Stefan Sperling 46f68b20 2019-10-19T11:06:56 show file mode differences when diffing trees
Stefan Sperling 63035f9f 2019-10-06T19:24:31 add -w (ignore whitespace) option to 'got diff'
Stefan Sperling 4ce46740 2019-08-08T12:44:18 label staged blobs with "(staged)" in got diff output
Stefan Sperling 31b4484f 2019-07-27T19:01:01 speed up rebase and histedit path prefix check: skip blob content diffs
Stefan Sperling aaa13589 2019-06-01T15:25:13 generalize got_diff_tree() by adding a diff output callback
Stefan Sperling 6c34b1aa 2019-03-18T17:25:10 whitespace formatting fixes in include/
Stefan Sperling b72f483a 2019-02-06T00:04:59 make 'got diff' show local changes in work tree
Stefan Sperling 54156555 2018-12-24T10:58:32 undo commit timestamps next to paths in diffs; they are redundant
Stefan Sperling adacb96f 2018-12-24T10:39:46 show commit timestamps in diff headers
Stefan Sperling 15a94983 2018-12-23T14:48:47 remove struct got_object from public library API
Stefan Sperling 4a8520aa 2018-10-18T22:32:17 use a constant for max diff context size
Stefan Sperling df2871d2 2018-10-18T11:45:20 make amount of diff context configurable at API level
Stefan Sperling f6861a81 2018-09-13T23:48:14 display file paths in diffs instead of blob SHA1s
Stefan Sperling 11528a82 2018-05-19T16:28:32 move common diff helpers from got and tog into lib/diff.c
Stefan Sperling 0c60ce5a 2018-04-02T11:10:05 document the current public API
Stefan Sperling 74671950 2018-02-12T00:15:49 add output file argument to got_diff_tree
Stefan Sperling 474b4f94 2017-11-30T01:41:44 add some unimplemented stubs for tree diffing
Stefan Sperling 62136d3a 2017-11-29T23:46:24 allow for custom diff header labels
Stefan Sperling ed9e98a8 2017-11-29T22:47:05 store global diff state in memory provided by caller
Stefan Sperling 7d283eee 2017-11-29T17:11:11 add and test basic blob diffing functionality