Commit Briefs

cf31b4749a Stefan Sperling

fix a segfault in got diff when a root commit is passed to -c

Problem reported by Alexander Arkhipov ok jamsek


760a1ec3d5 Stefan Sperling

make diffing files which changed into dirs and vice-versa possible

Problem marked with a TODO comment by me ages ago and rediscovered by naddy@ ok op@


5822e79e39 Omar Polo

include sha2.h too where sha1.h is included

In preparation for wide sha256 support; stsp@ agrees. Change done mechanically with find . -iname \*.[cy] -exec sam {} + X ,x/<sha1\.h>/i/\n#include <sha2.h>


bbc740ac49 Omar Polo

introduce got_object_id_hex to replace some got_sha1_digest_to_str()

It's an analogous to got_object_id_str but writes to the given buffer. ok + improvements by stsp@


1f3405c91d Mark Jamsek

refactor got log -d and tog diffstat to compute diff once

This eliminates the previous performance cost by making 'got log -d' and tog diff view compute the diffstat while building the diff in a temp file like we do with 'got diff -d'. Also, keep the current 'got log -d' UI as per stsp's suggestion. ok stsp@


5fa52d6cdc Mark Jamsek

got: style(9) and cleanup failure leaks lib/diff.c

Spotted while implementing diffstat plus one introduced with diffstat code. Don't leak 'change' on got_pathlist_append() error. And don't leak modestr{1,2} and l{1,2} char pointers in diff_blobs() and got_diff_tree(), respecitvely. Regarding modestr leaks, rather than free at all error return points, use op's suggestion to lift modestr vars to function scope. ok op@


6b37f13aa4 Mark Jamsek

add regress for 'got diff -d' and minor output fix

Ensure an actual file path is displayed in the 'got diff -d -c commit path ...' case when one of the specified paths is a deleted file. Prior to this, the unhelpful "/dev/null" label was shown instead. Includes some copypasta fixes noted by op. ok stsp@ op@


a76e88e58f Mark Jamsek

got: expand diffstat -d option to 'got diff'

Like got log -d, add the switch to 'got diff' to display a diffstat of changes; as per stsp's suggestion, we always include diff output with the diffstat. Disabled in gotwebd (for now :) Includes tweaks from op@ ok stsp@


3846622fc4 Mark Jamsek

plug leak of got_diffreg_result on output failure

Move 'done' labels up so that if got_diffreg_output() fails we still call got_diffreg_result_free() instead of jumping straight over it. ok + fix from stsp@


5191b70b5b Mark Jamsek

got: implement diffstat for got log and tog diff view

Add new got_diff_blob_cb() implementation to compute added/removed line metrics for a given diff. This enables displaying a diffstat with 'got log -d'. As per suggestion from stsp, change tog diff view to display the diffstat by default. ok stsp@


c87842d5ae 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@


2d61e38170 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@


36e83e5eea Omar Polo

check for fprintf failure


c7d5c43caf 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@


4b752015b5 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


49d4a01751 Stefan Sperling

move more opentemp out of diffreg.c

ok tracey


f9d376997d Stefan Sperling

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

ok tracey


eb81bc23c7 Tracey Emery

move got_opentempfd out of open_blob. ok stsp@


58e31a80da 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@


8469d82143 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@


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