Commits
- Commit:
8b925c6ccd3968917253ea191906a1710c40ed2d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add back sys/queue.h
Now that the handling of including sys/queue.h is better, there's no
need to remove those lines from the source. Copy the location of those
original sys/queue.h lines from upstream at the same line number, so as
to avoid any conflicts in the future.
- Commit:
25ec70067dea51a3c3ffd3c5f989853d80b847f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch 'tog diff' and 'tog blame' to Myers diff for speed
Make the choice of diff algorithm configurable by diff API users.
The got and gotweb programs keep using Patience diffs which are
prettier than Myers. But tog should be as fast as possible since
it is being used interactively. If performance of Patience diff
gets improved later we can consider switching tog back over to it.
ok tracey jamsek
- Commit:
dd2e2f52c1fb7a85d2d76afc68cec1175bbd52bd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move more opentemp out of diffreg.c
ok tracey
- Commit:
19a6a6b5eea7ed2df9eaaba2364d18ee05678ddd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- Commit:
f4ae6ddb59a1edbd016ad7f0e27c2599f8966e19
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
0c6f49baf2b43adf1cd027050d27fc32ef8454da
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
build with -Wwrite-strings
Throwing this into the mix for a while, we can always get rid of it
again if it becomes annoying. No objections from stsp@
- Commit:
9b4458b41088db703d890881c32dfd242efce4df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- Commit:
1758cce7892c5bec4d4ccd3de91615c3c78b23cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reuse a temporary file across commits during got log -p -S
suggested by + ok op@
- Commit:
a0f32f336ed3ba83f8d1afc8165502d06c472866
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move creation of tempfiles outside of lib/diff.c
ok tracey
- Commit:
4c71f93b66de6eee9e07d65a1f6ae8b13dd576b3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sort paths in got log -Pp and tog's diff view the same way as in the diff
reported by and fix confirmed by naddy
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
92a9e85d28a30997176ce0d3c2915e3ea70782c7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add FreeBSD support
This adds the capability to compile got-portable on FreeBSD.
- Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
- From:
- Thomas Adam <thomas@xteddy.org>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under
linux.
- Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere
ok millert, naddy
- Commit:
9c659ea03e148f73684817fbc7104feb365ee820
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not forget to add an offset for line zero in diff_blobs()
Fixes a problem in 'tog diff' where the first line of the output was cut off.
- Commit:
c354056f2214834e872d65b0f6714d8deea8fa51
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent potential fclose(NULL) in error path of diff_blobs()
- Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently label removed files as "/dev/null" in diff headers
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text
- Commit:
89dc8b78ad19e890f6dd1fe4259652a32ff89b16
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove stdbool.h where it's not needed
- Commit:
be659d10a8dd75e169fb7a246f54238dfc4386e8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix type of filesize output parameter of got_object_blob_dump_to_file()
- Commit:
cb7c1b68b55c0be52aab11fd9382a711dbf72d6c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused function got_diff_blob_prepared_file()
- Commit:
72254787333eeb9d226c5341bbfee1b48c1c0f30
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simply got_diff_prepare_file() by letting callers worry about file creation
- 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@