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@
- 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@
- 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
- Commit:
49d4a01751d39b078bfb27a2d63b5cfa69e410fd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move more opentemp out of diffreg.c
ok tracey
- Commit:
f9d376997dd2e84bf84c3c9a4da842d1b5565e9d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- 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@
- Commit:
b72706c3d172544098fcd24fd639374694a8fce9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move creation of tempfiles outside of lib/diff.c
ok tracey
- 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@
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text
- Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
0208f208304c36921fbcd86d33751b877aab1e96
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
- Commit:
46f68b205b4ab514846c5352c6d952720b9da365
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show file mode differences when diffing trees
- Commit:
63035f9f4ff2f4ea5b7361830edad916a30e37cd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -w (ignore whitespace) option to 'got diff'
- Commit:
4ce46740492b52299407d11c2571029be8ad295e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
label staged blobs with "(staged)" in got diff output
- Commit:
31b4484f27afc8ceaf636ad8c97d8a9aa119693e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
speed up rebase and histedit path prefix check: skip blob content diffs
- Commit:
aaa1358905e35eaa19a177bd11797d1a38d6cc03
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
generalize got_diff_tree() by adding a diff output callback
- Commit:
6c34b1aaf4f7557da7a8f12bfc5109491faa1937
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
whitespace formatting fixes in include/
- Commit:
b72f483a5d3d0699d6ff221cd44f8853eded0a32
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got diff' show local changes in work tree
- Commit:
5415655556f118165e3643dc22d370cb9fef469b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
undo commit timestamps next to paths in diffs; they are redundant
- Commit:
adacb96fd801526f57caee393ea94c6962781ff0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show commit timestamps in diff headers
- Commit:
15a949835c36ceb581fc115aff744dbb30b12918
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove struct got_object from public library API
- Commit:
4a8520aa6bbd7d1193aabc34e80edce3d18c0239
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a constant for max diff context size
- Commit:
df2871d297805326f5d359be74d6b309537f768b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make amount of diff context configurable at API level
- Commit:
f6861a8122f025e3ba8dd3c13215c27b6bf184cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
display file paths in diffs instead of blob SHA1s
- Commit:
11528a829855823153f2aaa9438bdf400a2995d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move common diff helpers from got and tog into lib/diff.c