Commits

Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
From:
Stefan Sperling <stsp@stsp.name>
Date:
consistently label removed files as "/dev/null" in diff headers
diff | patch | tree
Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle binary files in got/tog diff commands; add -a options to force text
diff | patch | tree
Commit:
cca5682ee944c46413628161f13e2779718f0536
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow for configuring a custom file atomizer with got_diff_get_config()
diff | patch | tree
Commit:
24e87ea36353362f676afa722d0b7361a7223cbc
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused function got_diffreg_prepared_files()
diff | patch | tree
Commit:
cb7c1b68b55c0be52aab11fd9382a711dbf72d6c
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused function got_diff_blob_prepared_file()
diff | patch | tree
Commit:
72254787333eeb9d226c5341bbfee1b48c1c0f30
From:
Stefan Sperling <stsp@stsp.name>
Date:
simply got_diff_prepare_file() by letting callers worry about file creation
diff | patch | tree
Commit:
62ad13c507a97d98899383907ff33c526073e287
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused empty function got_diff_dump_change()
diff | patch | tree
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.
diff | patch | tree
Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
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.
diff | patch | tree
Commit:
ad7de6a5165442ec89b9daaadb18901a981befee
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused function got_diff_blob_file_lines_changed()
diff | patch | tree
Commit:
a7c9878d5b0e7770339e76efc0821897fe7a6be8
From:
Stefan Sperling <stsp@stsp.name>
Date:
make stage -p show the number of changes in a file
diff | patch | tree
Commit:
dc424a06a9c1f0f664cee320cc1b34752f33ec97
From:
Stefan Sperling <stsp@stsp.name>
Date:
initial 'got stage -p' implementation
diff | patch | tree
Commit:
7f1f93af7593347c6efde1bc79997fbff2b64ef2
From:
Stefan Sperling <stsp@stsp.name>
Date:
introduce got_diff_blob_file_lines_changed()
diff | patch | tree