Commit Briefs

a558dd1be5 Stefan Sperling

reuse a temporary file across commits during got log -p -S

suggested by + ok op@


b72706c3d1 Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey


46ea77db89 Stefan Sperling

sort paths in got log -Pp and tog's diff view the same way as in the diff

reported by and fix confirmed by naddy


67b631c9e0 Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@


56b63ca4ab Stefan Sperling

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

ok millert, naddy


9c659ea03e Stefan Sperling

do not forget to add an offset for line zero in diff_blobs()

Fixes a problem in 'tog diff' where the first line of the output was cut off.





89dc8b78ad Stefan Sperling

remove stdbool.h where it's not needed



cb7c1b68b5 Stefan Sperling

remove unused function got_diff_blob_prepared_file()



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.


40dde666c0 Stefan Sperling

add support for symlinks in the repository to 'got diff'


0208f20830 Stefan Sperling

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

requested by matthieu@


56e0773df7 Stefan Sperling

convert tree entries from SIMPLEQ to an array


46f68b205b Stefan Sperling

show file mode differences when diffing trees


63035f9f4f Stefan Sperling

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


63c5ca5de4 Stefan Sperling

detect and ignore Git submodules


4c9641fdb6 Stefan Sperling

fix and simplify blame algorithm

Always diff against latest version of file. This is much easier since there is no need to keep track of lines shifting around.


4ce4674049 Stefan Sperling

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


ad7de6a516 Stefan Sperling

remove unused function got_diff_blob_file_lines_changed()


dc424a06a9 Stefan Sperling

initial 'got stage -p' implementation


7f1f93af75 Stefan Sperling

introduce got_diff_blob_file_lines_changed()