Got Mirror

Commit Briefs

3 years ago 1cb46f007d Stefan Sperling

consistently label removed files as "/dev/null" in diff headers

diff | patch | tree

3 years ago 64453f7e55 Stefan Sperling

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

diff | patch | tree

3 years ago cca5682ee9 Stefan Sperling

allow for configuring a custom file atomizer with got_diff_get_config()

diff | patch | tree

3 years ago 24e87ea363 Stefan Sperling

remove unused function got_diffreg_prepared_files()

diff | patch | tree

3 years ago cb7c1b68b5 Stefan Sperling

remove unused function got_diff_blob_prepared_file()

diff | patch | tree

3 years ago 7225478733 Stefan Sperling

simply got_diff_prepare_file() by letting callers worry about file creation

diff | patch | tree

3 years ago 62ad13c507 Stefan Sperling

remove unused empty function got_diff_dump_change()

diff | patch | tree

3 years ago 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

4 years ago f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

4 years ago d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

5 years ago 4c9641fdb6 Stefan Sperling

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.

diff | patch | tree

5 years ago ad7de6a516 Stefan Sperling

remove unused function got_diff_blob_file_lines_changed()

diff | patch | tree

5 years ago a7c9878d5b Stefan Sperling

make stage -p show the number of changes in a file

diff | patch | tree

5 years ago dc424a06a9 Stefan Sperling

initial 'got stage -p' implementation

diff | patch | tree

5 years ago 7f1f93af75 Stefan Sperling

introduce got_diff_blob_file_lines_changed()

diff | patch | tree

5 years ago 01a4495616 Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

5 years ago 57ee5d5084 Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

5 years ago a551f2158d Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

5 years ago 9f98de9c49 Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

5 years ago acb209ee71 Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree

6 years ago 404c43c4fa Stefan Sperling

basic 'got blame' implementation

diff | patch | tree

6 years ago e97248b0f4 Stefan Sperling

prune unused declarations from got_lib_diff.h

diff | patch | tree

6 years ago c48ceb4cb5 Stefan Sperling

remove support for the ifdef diff format from diffreg

diff | patch | tree

6 years ago 1afa8e435b Stefan Sperling

remove REVERSE and NREVERSE diff output options from diffreg

diff | patch | tree

6 years ago 6525c300e6 Stefan Sperling

forgot to delete D_EDIT in previous

diff | patch | tree