Commit Briefs

Mark Jamsek

show file mode for new added files in work tree diffs

Make work tree diffs of local changes on disk display the file mode of new added files like other versions of `got diff` currently do. ok stsp@


Mark Jamsek

tog: fix typo in diff nlines > 0 check

We want to check if *nlines is greater than zero here. ok op@ and stsp@


Omar Polo

check for fprintf failure


Mark Jamsek

tog: keymaps to jump to next/prev file/hunk in the diff

Add () and {} key maps to navigate to the previous and next file or hunk in the diff. This required changing Got's diff API to collect line type metadata in addition to the line offsets already produced as prompted by stsp. ok stsp@


Stefan Sperling

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

move more opentemp out of diffreg.c

ok tracey


Stefan Sperling

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

ok tracey



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@


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@


Stefan Sperling

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

suggested by + ok op@


Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey


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


Stefan Sperling

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

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


Stefan Sperling

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

ok millert, naddy