Game of Trees Repos

Commits

Commit:: 64453f7e55c4c69b6cd08229929ed8227b789ff8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Nov 21 13:35:00 2020 UTC

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

diff | patch | tree

Commit:: fe621944e83fe6367f7bff97128b4240a9cdc7c5
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Nov 10 22:54:37 2020 UTC

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

Commit:: 0208f208304c36921fbcd86d33751b877aab1e96
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue May 5 09:53:57 2020 UTC

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

diff | patch | tree

Commit:: 46f68b205b4ab514846c5352c6d952720b9da365
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Oct 19 11:06:56 2019 UTC

show file mode differences when diffing trees

diff | patch | tree

Commit:: 63035f9f4ff2f4ea5b7361830edad916a30e37cd
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Oct 6 19:24:31 2019 UTC

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

diff | patch | tree

Commit:: 4ce46740492b52299407d11c2571029be8ad295e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Aug 8 10:44:18 2019 UTC

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

diff | patch | tree

Commit:: 31b4484f27afc8ceaf636ad8c97d8a9aa119693e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Jul 27 17:01:01 2019 UTC

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

diff | patch | tree

Commit:: aaa1358905e35eaa19a177bd11797d1a38d6cc03
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Jun 1 14:22:43 2019 UTC

generalize got_diff_tree() by adding a diff output callback

diff | patch | tree

Commit:: 6c34b1aaf4f7557da7a8f12bfc5109491faa1937
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 18 16:25:10 2019 UTC

whitespace formatting fixes in include/

diff | patch | tree

Commit:: b72f483a5d3d0699d6ff221cd44f8853eded0a32
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 5 23:04:59 2019 UTC

make 'got diff' show local changes in work tree

diff | patch | tree

Commit:: 5415655556f118165e3643dc22d370cb9fef469b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Dec 24 09:58:32 2018 UTC

undo commit timestamps next to paths in diffs; they are redundant

diff | patch | tree

Commit:: adacb96fd801526f57caee393ea94c6962781ff0
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Dec 24 09:39:46 2018 UTC

show commit timestamps in diff headers

diff | patch | tree

Commit:: 15a949835c36ceb581fc115aff744dbb30b12918
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Dec 23 13:48:47 2018 UTC

remove struct got_object from public library API

diff | patch | tree

Commit:: 4a8520aa6bbd7d1193aabc34e80edce3d18c0239
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Oct 18 20:32:17 2018 UTC

use a constant for max diff context size

diff | patch | tree

Commit:: df2871d297805326f5d359be74d6b309537f768b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Oct 18 09:45:20 2018 UTC

make amount of diff context configurable at API level

diff | patch | tree

Commit:: f6861a8122f025e3ba8dd3c13215c27b6bf184cb
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Sep 13 21:48:14 2018 UTC

display file paths in diffs instead of blob SHA1s

diff | patch | tree

Commit:: 11528a829855823153f2aaa9438bdf400a2995d7
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat May 19 14:28:32 2018 UTC

move common diff helpers from got and tog into lib/diff.c

diff | patch | tree

Commit:: 0c60ce5ab29975b198dec154bc2ebbea83916eb9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Apr 2 09:10:05 2018 UTC

document the current public API

diff | patch | tree

Commit:: 74671950360a2118267670efd700a5328f3eeca4
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 11 23:15:49 2018 UTC

add output file argument to got_diff_tree

diff | patch | tree

Commit:: 474b4f942340d76684764aab281f8f7efe1878b8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Nov 30 00:41:44 2017 UTC

add some unimplemented stubs for tree diffing

diff | patch | tree

Commit:: 62136d3a8b190e48501f0717bfd42e044e92616d
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Nov 29 22:46:24 2017 UTC

allow for custom diff header labels

diff | patch | tree

Commit:: ed9e98a87f98e37724a8782da846cb01b5f3d282
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Nov 29 21:47:05 2017 UTC

store global diff state in memory provided by caller

diff | patch | tree

Commit:: 7d283eeedcc17429a90e21e179a6bb5183ffe3c8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Nov 29 16:11:11 2017 UTC

add and test basic blob diffing functionality

diff | patch | tree