lib/got_lib_diff.h


Log

Author Commit Date CI Message
Stefan Sperling fdf3c2d3 2021-06-17T09:01:05 use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.
Stefan Sperling db590691 2021-06-02T09:24:51 make merge_file() accept FILEs instead of paths for orig and deriv inputs
Stefan Sperling 1cb46f00 2020-11-21T15:34:19 consistently label removed files as "/dev/null" in diff headers
Stefan Sperling 64453f7e 2020-11-21T13:35:00 handle binary files in got/tog diff commands; add -a options to force text
Stefan Sperling cca5682e 2020-11-18T16:34:28 allow for configuring a custom file atomizer with got_diff_get_config()
Stefan Sperling 24e87ea3 2020-11-18T16:15:41 remove unused function got_diffreg_prepared_files()
Stefan Sperling cb7c1b68 2020-11-18T16:14:30 remove unused function got_diff_blob_prepared_file()
Stefan Sperling 72254787 2020-11-18T16:12:35 simply got_diff_prepare_file() by letting callers worry about file creation
Stefan Sperling 62ad13c5 2020-11-16T20:55:57 remove unused empty function got_diff_dump_change()
Stefan Sperling 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.
Stefan Sperling f69721c3 2019-10-21T09:04:57 show base commit hash and omit filenames in conflict markers
Stefan Sperling d136cfcb 2019-10-12T07:33:12 show original file content in conflict markers
Stefan Sperling 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.
Stefan Sperling ad7de6a5 2019-08-08T09:27:38 remove unused function got_diff_blob_file_lines_changed()
Stefan Sperling a7c9878d 2019-08-08T08:40:38 make stage -p show the number of changes in a file
Stefan Sperling dc424a06 2019-08-07T17:26:35 initial 'got stage -p' implementation
Stefan Sperling 7f1f93af 2019-08-06T17:24:17 introduce got_diff_blob_file_lines_changed()
Stefan Sperling 01a44956 2019-03-27T08:36:44 declare conflict marker strings in got_lib_diff.h
Stefan Sperling 57ee5d50 2019-02-08T15:10:49 allow callers of diff3 code to detect merge conflicts
Stefan Sperling a551f215 2019-02-08T14:58:30 diff3: make labels work and fix leaks
Stefan Sperling acb209ee 2019-02-07T13:59:17 restore support for D_NORMAL diffs of regular files
Stefan Sperling 9f98de9c 2019-02-08T12:09:28 declare got_merge_diff3()
Stefan Sperling 404c43c4 2018-06-21T23:22:57 basic 'got blame' implementation
Stefan Sperling e97248b0 2018-04-02T21:01:27 prune unused declarations from got_lib_diff.h
Stefan Sperling c48ceb4c 2018-04-02T20:58:50 remove support for the ifdef diff format from diffreg
Stefan Sperling 1afa8e43 2018-04-02T20:54:51 remove REVERSE and NREVERSE diff output options from diffreg
Stefan Sperling 6525c300 2018-04-02T20:51:57 forgot to delete D_EDIT in previous
Stefan Sperling 119f8600 2018-04-02T20:49:11 remove support for "normal" diff output from diffreg
Stefan Sperling 84e11851 2018-04-02T20:47:21 remove support for context diffs from diffreg.c
Stefan Sperling a2a848a2 2018-04-02T20:43:42 remove ignore-lines pattern support from diffreg code
Stefan Sperling 76735683 2018-04-02T16:37:53 move diffreg's max_context into struct got_diff_state
Stefan Sperling 718b3ab0 2018-03-17T17:50:48 rename the library-internal headers again to a common prefix