Commits
- 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:
40dde666c0e7cae797b8652b1f4368e52c2c7b13
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for symlinks in the repository to 'got diff'
- 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:
56e0773df7e12fc69c1f6f9d171c93fd78a13d0e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
convert tree entries from SIMPLEQ to an array
- 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:
63c5ca5de411be54e75480b0efec04014ffab46e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
detect and ignore Git submodules
- Commit:
4c9641fdb639da1d7ad1bde82b3010e5ac1e096f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix and simplify blame algorithm
Always diff against latest version of file. This is much easier
since there is no need to keep track of lines shifting around.
- Commit:
4ce46740492b52299407d11c2571029be8ad295e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
label staged blobs with "(staged)" in got diff output
- Commit:
ad7de6a5165442ec89b9daaadb18901a981befee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused function got_diff_blob_file_lines_changed()
- Commit:
dc424a06a9c1f0f664cee320cc1b34752f33ec97
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got stage -p' implementation
- Commit:
7f1f93af7593347c6efde1bc79997fbff2b64ef2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
introduce got_diff_blob_file_lines_changed()
- Commit:
31b4484f27afc8ceaf636ad8c97d8a9aa119693e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
speed up rebase and histedit path prefix check: skip blob content diffs
- Commit:
e09a504cc5b72ff4eca5d539b6fb50c8d01d0036
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
introduce support for abbreviated object IDs
- Commit:
6c4c42e07c3ebc32f3ea82173f6936b9f522733a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement search for 'tog blame'
- Commit:
aaa1358905e35eaa19a177bd11797d1a38d6cc03
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
generalize got_diff_tree() by adding a diff output callback
- Commit:
1de5e06571b18a9888f0e659ef6f91b82d5c0c42
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_object_tree_find_entry() instead of local copy in diff.c
- Commit:
638f9024045bbe2420143f8868dcc484c231c634
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename got_error_prefix_errno() to got_error_from_errno()
- Commit:
230a42bdc60c6136d2a5ce65bf1a2f26d990c096
- From:
- joshua stein <jcs@jcs.org>
- Date:
got_error_from_errno -> got_error_prefix_errno
also add got_error_prefix_errno2 and got_error_prefix_errno3 which
should hopefully all be merged into a single function with variadic
args (but can't alloc mem)
- Commit:
324d37e7c791a6e6ff08598c3e6206ba956d0965
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got path APIs available to library consumers
- Commit:
049da17d24a611282abd3553f6f43d75609a7fab
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use correct diff header label for deletion in got_diff_blob_file()
- Commit:
c2ac94566e2a939475a82ccfde0d509ea8508c7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing 'static' for local functions
- Commit:
fb43ecf1500cf7f8b2e22348bd1635edcda97fee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check for errors from fclose()
- Commit:
d1688ce08917f7071c7bbfc44ae27624c0a1efd8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove a pointless error code
- Commit:
b72f483a5d3d0699d6ff221cd44f8853eded0a32
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got diff' show local changes in work tree