Commit Briefs

b72706c3d1 Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey

diff | patch | tree

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@

diff | patch | tree

64453f7e55 Stefan Sperling

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

diff | patch | tree

fe621944e8 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

0208f20830 Stefan Sperling

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

requested by matthieu@

diff | patch | tree

46f68b205b Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

63035f9f4f Stefan Sperling

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

diff | patch | tree

4ce4674049 Stefan Sperling

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

diff | patch | tree

31b4484f27 Stefan Sperling

speed up rebase and histedit path prefix check: skip blob content diffs

diff | patch | tree

aaa1358905 Stefan Sperling

generalize got_diff_tree() by adding a diff output callback

diff | patch | tree

6c34b1aaf4 Stefan Sperling

whitespace formatting fixes in include/

diff | patch | tree

b72f483a5d Stefan Sperling

make 'got diff' show local changes in work tree

diff | patch | tree

5415655556 Stefan Sperling

undo commit timestamps next to paths in diffs; they are redundant

diff | patch | tree

adacb96fd8 Stefan Sperling

show commit timestamps in diff headers

diff | patch | tree

15a949835c Stefan Sperling

remove struct got_object from public library API

diff | patch | tree

4a8520aa6b Stefan Sperling

use a constant for max diff context size

diff | patch | tree

df2871d297 Stefan Sperling

make amount of diff context configurable at API level

diff | patch | tree

f6861a8122 Stefan Sperling

display file paths in diffs instead of blob SHA1s

diff | patch | tree

11528a8298 Stefan Sperling

move common diff helpers from got and tog into lib/diff.c

diff | patch | tree

0c60ce5ab2 Stefan Sperling

document the current public API

diff | patch | tree

7467195036 Stefan Sperling

add output file argument to got_diff_tree

diff | patch | tree

474b4f9423 Stefan Sperling

add some unimplemented stubs for tree diffing

diff | patch | tree

62136d3a8b Stefan Sperling

allow for custom diff header labels

diff | patch | tree

ed9e98a87f Stefan Sperling

store global diff state in memory provided by caller

diff | patch | tree

7d283eeedc Stefan Sperling

add and test basic blob diffing functionality

diff | patch | tree