|
fe621944
|
2020-11-10T22:54:37
|
|
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.
|
|
|
40dde666
|
2020-07-23T14:21:29
|
|
add support for symlinks in the repository to 'got diff'
|
|
|
0208f208
|
2020-05-05T09:53:57
|
|
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
|
|
|
56e0773d
|
2019-11-28T02:32:58
|
|
convert tree entries from SIMPLEQ to an array
|
|
|
46f68b20
|
2019-10-19T11:06:56
|
|
show file mode differences when diffing trees
|
|
|
63035f9f
|
2019-10-06T19:24:31
|
|
add -w (ignore whitespace) option to 'got diff'
|
|
|
63c5ca5d
|
2019-08-24T20:56:15
|
|
detect and ignore Git submodules
|
|
|
4c9641fd
|
2019-08-21T16:57:44
|
|
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.
|
|
|
4ce46740
|
2019-08-08T12:44:18
|
|
label staged blobs with "(staged)" in got diff output
|
|
|
ad7de6a5
|
2019-08-08T09:27:38
|
|
remove unused function got_diff_blob_file_lines_changed()
|
|
|
dc424a06
|
2019-08-07T17:26:35
|
|
initial 'got stage -p' implementation
|
|
|
7f1f93af
|
2019-08-06T17:24:17
|
|
introduce got_diff_blob_file_lines_changed()
|
|
|
31b4484f
|
2019-07-27T19:01:01
|
|
speed up rebase and histedit path prefix check: skip blob content diffs
|
|
|
e09a504c
|
2019-06-28T20:59:14
|
|
introduce support for abbreviated object IDs
|
|
|
6c4c42e0
|
2019-06-24T22:28:11
|
|
implement search for 'tog blame'
|
|
|
aaa13589
|
2019-06-01T15:25:13
|
|
generalize got_diff_tree() by adding a diff output callback
|
|
|
1de5e065
|
2019-06-01T14:44:21
|
|
use got_object_tree_find_entry() instead of local copy in diff.c
|
|
|
638f9024
|
2019-05-13T12:40:57
|
|
rename got_error_prefix_errno() to got_error_from_errno()
|
|
230a42bd
|
2019-05-11T13:04:38
|
|
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)
|
|
|
324d37e7
|
2019-05-11T09:14:30
|
|
make got path APIs available to library consumers
|
|
|
049da17d
|
2019-03-26T10:34:58
|
|
use correct diff header label for deletion in got_diff_blob_file()
|
|
|
c2ac9456
|
2019-03-15T16:39:34
|
|
add missing 'static' for local functions
|
|
|
fb43ecf1
|
2019-02-11T11:59:09
|
|
check for errors from fclose()
|
|
|
d1688ce0
|
2019-02-06T00:08:47
|
|
remove a pointless error code
|
|
|
b72f483a
|
2019-02-06T00:04:59
|
|
make 'got diff' show local changes in work tree
|
|
|
09de383e
|
2018-12-24T14:18:21
|
|
fix crash in blame since 18f4293943894155d5ccbdb423f1e8a2bb1e1d62
|
|
|
54156555
|
2018-12-24T10:58:32
|
|
undo commit timestamps next to paths in diffs; they are redundant
|
|
|
18f42939
|
2018-12-24T10:49:42
|
|
show blob headers in diffs for added/deleted files
|
|
|
adacb96f
|
2018-12-24T10:39:46
|
|
show commit timestamps in diff headers
|
|
|
15a94983
|
2018-12-23T14:48:47
|
|
remove struct got_object from public library API
|
|
|
45d799e2
|
2018-12-23T12:10:27
|
|
make commit objects opaque in the library's API
|
|
|
abd2672a
|
2018-12-23T11:36:31
|
|
move commit header printing in diffs out of the library
|
|
|
e20293f2
|
2018-11-17T16:35:27
|
|
revert previous; it made a wrong assumption and broke diff
|
|
|
4b917664
|
2018-11-17T16:34:00
|
|
make diff's match_entry_by_name() exit early if possible
|
|
|
d6ce02f1
|
2018-11-17T16:30:29
|
|
fix paths in diffs showing newly added trees
|
|
|
19ae6da1
|
2018-11-05T16:38:08
|
|
compare object IDs just once in diff_entry_old_new()
|
|
|
ccb26ccd
|
2018-11-05T16:16:35
|
|
avoid a call to mktime() in commit graph's add_node()
|
|
|
df2871d2
|
2018-10-18T11:45:20
|
|
make amount of diff context configurable at API level
|
|
|
60f50a58
|
2018-09-15T15:20:24
|
|
don't crash in got_diff_tree() if trees are empty
|
|
|
0dcf3e9c
|
2018-09-15T10:57:05
|
|
tweak log message headers again
|
|
|
dab5fe87
|
2018-09-14T20:22:22
|
|
tweak commit display
|
|
|
405a764e
|
2018-09-14T00:30:38
|
|
don't display blob IDs twice when diffing blobs directly
|
|
|
3b8ef1a8
|
2018-09-14T00:25:13
|
|
tweak diff output and adjust test expectations accordingly
|
|
|
8f97f261
|
2018-09-14T00:13:19
|
|
show blob IDs in diffs again and make repository test pass
|
|
|
f6861a81
|
2018-09-13T23:48:14
|
|
display file paths in diffs instead of blob SHA1s
|
|
|
ede67fd9
|
2018-07-10T23:32:29
|
|
remove empty line from commit diff output
|
|
|
84451b3e
|
2018-07-10T13:17:00
|
|
implement incremental blame display for tog
|
|
|
883f0469
|
2018-06-23T17:57:39
|
|
make struct got_tree_object opaque
|
|
|
404c43c4
|
2018-06-21T23:22:57
|
|
basic 'got blame' implementation
|
|
|
35e9ba5d
|
2018-06-21T19:41:20
|
|
introduce got_object_blob_dump_to_file()
|
|
|
4bb494d5
|
2018-06-16T19:24:46
|
|
display UTC commit timestamps in tog(1)
|
|
|
9fc8d6a2
|
2018-05-20T15:14:11
|
|
check fprintf() return values in got_diff_objects_as_commits()
|
|
|
9b697879
|
2018-05-20T13:03:52
|
|
make got_diff_objects_as_commits() require obj2 parameter
|
|
|
bacc9935
|
2018-05-20T13:02:12
|
|
show log message above a diff between commits
|
|
|
b74c7625
|
2018-05-20T12:51:27
|
|
make git_diff_object helpers error if both objects are NULL
|
|
|
cd0acaa7
|
2018-05-20T12:37:25
|
|
allow switching from log view to diff view in tog
|
|
|
511a516b
|
2018-05-19T16:57:12
|
|
move got_opentmp* functions to public API; used from tog
|
|
|
11528a82
|
2018-05-19T16:28:32
|
|
move common diff helpers from got and tog into lib/diff.c
|
|
|
730a8aa0
|
2018-04-24T13:49:33
|
|
don't override error codes in diff_modified_blob()
|
|
|
dfb54902
|
2018-04-02T11:45:31
|
|
wrap long lines
|
|
|
2acfca77
|
2018-04-01T17:44:32
|
|
don't forgot to close blobs after diffing them
|
|
|
84eb021e
|
2018-03-27T23:18:58
|
|
show function prototypes in diff output
|
|
|
07ccb00b
|
2018-03-27T23:08:07
|
|
be careful about NULL trees when diffing entries
|
|
|
c2c21d46
|
2018-03-27T21:56:33
|
|
show 3 lines of context in file diffs
|
|
|
718b3ab0
|
2018-03-17T17:50:48
|
|
rename the library-internal headers again to a common prefix
|
|
|
25783624
|
2018-03-12T13:59:29
|
|
use stricter CPPFLAGS from mpi
|
|
|
32cb896c
|
2018-03-11T14:10:56
|
|
rename library-private headers from *_priv.h to *_lib.h
|
|
|
1411938b
|
2018-02-12T23:25:38
|
|
rename private header filenames so they are in got_ namespace
|
|
|
59ece79d
|
2018-02-12T22:13:27
|
|
make struct got_object_id opaque
|
|
|
f934cf2c
|
2018-02-12T21:27:40
|
|
make struct got_blob_object opaque
|
|
|
eba5c6bb
|
2018-02-12T00:25:40
|
|
repair blob diffing
|
|
|
74671950
|
2018-02-12T00:15:49
|
|
add output file argument to got_diff_tree
|
|
|
eb651edf
|
2018-02-11T18:16:43
|
|
more progress on reading packed/deltified objects
|
|
|
eef6493a
|
2018-01-19T18:09:29
|
|
Make struct got_object opaque to users of the library
|
|
|
b107e67f
|
2018-01-19T18:03:07
|
|
Implement open() support for offset delta objects
|
|
|
a1fd68d8
|
2018-01-12T20:59:51
|
|
Extract non-deltified objects from pack files.
|
|
|
a3e2cbea
|
2017-12-01T22:09:59
|
|
make tree diffing work
|
|
|
98abbc84
|
2017-11-30T16:18:10
|
|
test tree diff (not yet working correctly)
|
|
|
013404a9
|
2017-11-30T16:04:00
|
|
add todo comment
|
|
|
2c56f2ce
|
2017-11-30T16:03:14
|
|
implement diff_deleted_tree
|
|
|
9c70d4c3
|
2017-11-30T16:02:22
|
|
implement diff_added_tree
|
|
|
789689b5
|
2017-11-30T15:58:34
|
|
implement diff_modified_tree
|
|
|
c7020aea
|
2017-11-30T15:49:49
|
|
increase buffer sizes for blob diffing
|
|
|
365fb436
|
2017-11-30T15:48:52
|
|
implement diff_deleted_blob
|
|
|
a7852263
|
2017-11-30T15:37:45
|
|
handle fdopen() failure in opentemp()
|
|
|
cb74ff21
|
2017-11-30T15:12:45
|
|
pass output file to diffreg
|
|
|
6a213ccb
|
2017-11-30T05:49:52
|
|
implement diff_modified_blob
|
|
|
4e22badc
|
2017-11-30T05:34:24
|
|
implement diff_added_blob
|
|
|
0cb61c47
|
2017-11-30T02:39:35
|
|
whitespace
|
|
|
f9d67749
|
2017-11-30T02:38:38
|
|
move tempfile creation out of got_diffreg()
|
|
|
413ea19d
|
2017-11-30T01:44:46
|
|
simplify
|
|
|
4209f790
|
2017-11-30T01:43:44
|
|
fix logic error
|
|
|
474b4f94
|
2017-11-30T01:41:44
|
|
add some unimplemented stubs for tree diffing
|
|
|
62136d3a
|
2017-11-29T23:46:24
|
|
allow for custom diff header labels
|
|
|
f78b0693
|
2017-11-29T23:42:16
|
|
show blob IDs in diff header
|
|
|
8ba9a219
|
2017-11-29T23:30:52
|
|
remove diff_args from global state as well
|
|
|
1c7f0520
|
2017-11-29T22:52:00
|
|
store stat buffers in diff_state rather than diff_args
|
|
|
ed9e98a8
|
2017-11-29T22:47:05
|
|
store global diff state in memory provided by caller
|
|
|
7d283eee
|
2017-11-29T17:11:11
|
|
add and test basic blob diffing functionality
|