Commit Briefs

Omar Polo

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@

diff | patch | tree

Stefan Sperling

always show commit or tree IDs in diff header, in order to help 'got patch'

The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@

diff | patch | tree

Stefan Sperling

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

suggested by + ok op@

diff | patch | tree

Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey

diff | patch | tree

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

diff | patch | tree

Stefan Sperling

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

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

diff | patch | tree

Stefan Sperling

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

ok millert, naddy

diff | patch | tree

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.

diff | patch | tree

Stefan Sperling

prevent potential fclose(NULL) in error path of diff_blobs()

diff | patch | tree

Stefan Sperling

consistently label removed files as "/dev/null" in diff headers

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

remove stdbool.h where it's not needed

diff | patch | tree

Stefan Sperling

fix type of filesize output parameter of got_object_blob_dump_to_file()

diff | patch | tree

Stefan Sperling

remove unused function got_diff_blob_prepared_file()

diff | patch | tree

Stefan Sperling

simply got_diff_prepare_file() by letting callers worry about file creation

diff | patch | tree

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.

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

requested by matthieu@

diff | patch | tree

Stefan Sperling

convert tree entries from SIMPLEQ to an array

diff | patch | tree

Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

detect and ignore Git submodules

diff | patch | tree

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.

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

remove unused function got_diff_blob_file_lines_changed()

diff | patch | tree