Commits

Commit:
c87842d5aed77e4f15bab3980e8cb22f18e954f8
From:
Mark Jamsek <mark@jamsek.dev>
Date:
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@
diff | patch | tree
Commit:
2d61e38170df9e7e558024fa6f3c05196148f15a
From:
Mark Jamsek <mark@jamsek.dev>
Date:
tog: fix typo in diff nlines > 0 check We want to check if *nlines is greater than zero here. ok op@ and stsp@
diff | patch | tree
Commit:
36e83e5eea8d1387c024006cc320e4ef9d545b16
From:
Omar Polo <op@omarpolo.com>
Date:
check for fprintf failure
diff | patch | tree
Commit:
c7d5c43cafada3470647a8b876d489018002f713
From:
Mark Jamsek <mark@jamsek.dev>
Date:
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@
diff | patch | tree
Commit:
4b752015b5208a96c2d1b6c1c6b8589884b8b2b6
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
diff | patch | tree
Commit:
49d4a01751d39b078bfb27a2d63b5cfa69e410fd
From:
Stefan Sperling <stsp@stsp.name>
Date:
move more opentemp out of diffreg.c ok tracey
diff | patch | tree
Commit:
f9d376997dd2e84bf84c3c9a4da842d1b5565e9d
From:
Stefan Sperling <stsp@stsp.name>
Date:
move got_opentempfd() out of lib/diff.c again ok tracey
diff | patch | tree
Commit:
eb81bc23c735e8aa9eaee796a230c7d7c76657ba
From:
Tracey Emery <tracey@traceyemery.net>
Date:
move got_opentempfd out of open_blob. ok stsp@
diff | patch | tree
Commit:
58e31a80da4f4a9e10eaea148672190f35107a47
From:
Omar Polo <op@omarpolo.com>
Date:
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
Commit:
8469d82143a591d423c000c47c63bababe6f5716
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
a558dd1be5714d8e7a83f7d63180550e86ccae5c
From:
Stefan Sperling <stsp@stsp.name>
Date:
reuse a temporary file across commits during got log -p -S suggested by + ok op@
diff | patch | tree
Commit:
b72706c3d172544098fcd24fd639374694a8fce9
From:
Stefan Sperling <stsp@stsp.name>
Date:
move creation of tempfiles outside of lib/diff.c ok tracey
diff | patch | tree
Commit:
46ea77db89a0945a013f032c6c6a94779126412f
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53
From:
Stefan Sperling <stsp@stsp.name>
Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere ok millert, naddy
diff | patch | tree