Commits
- Commit:
7a800a02c49f1b97dfd6344a10df6e741894de56
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync file with diff.git 279d77aa1e4b921090e702a6a8a5a94a98a062b1 and
use the faster headers-only mode for diff3
- Commit:
a42e5f4ff97c315089711cf82a4ac526215f7af1
- From:
- Tom Jones <thj@freebsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch diff output mode from "edscript" to "plain" for diff3
getchange() in diff3.c takes any line that starts with an integer
and treats it as a hunk header. It doesn't actually require ed script
instructions, and traditional ed script diff output would break it.
Thus, changing Got's diff3 to rely on plain diff output mode paves the
way for implementing traditional ed-script style output in diff.git.
Patch by Tom Jones
- Commit:
b6b86fd1b9828e38d59915e62fddce62952b8b75
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
82c78e96f11e4190c3d91f18122df14e30347300
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: keymaps to jump to next/prev file/hunk in the diff
Add () and {} key maps to navigate to the previous and next file or hunk in
the diff. This required changing Got's diff API to collect line type metadata
in addition to the line offsets already produced as prompted by stsp.
ok stsp@
- 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:
89fe1c42b34d471ab9756eb05231a5d72339e8c8
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: fix-up sha1.h include
-portable doesn't need this directly.
- Commit:
9a267125aa0f9487f325eea3e3c551ad9a19ca51
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
82f9484cc55a71e0bce201220c989e5058da6b9d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: include sha1.h portably
Don't directly include sha1.h as this isn't always in the same location
across systems.
- Commit:
c17f3d0c7b2d780dbb8117b66d797c92c1f4add3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
b0e25f642db7b3e726f2827eb39b61bfea3e9c50
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: freebsd: portably include sha1
The SHA implementation is found portably across systems, so don't
include sha1.h directly.
- Commit:
ec242592d329728975bf10a1196907167de7fed0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- 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:
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:
cca5682ee944c46413628161f13e2779718f0536
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow for configuring a custom file atomizer with got_diff_get_config()
- Commit:
24e87ea36353362f676afa722d0b7361a7223cbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused function got_diffreg_prepared_files()
- Commit:
72254787333eeb9d226c5341bbfee1b48c1c0f30
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simply got_diff_prepare_file() by letting callers worry about file creation
- Commit:
62ad13c507a97d98899383907ff33c526073e287
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused empty function got_diff_dump_change()
- 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:
efbadcb1d6a9f47a1f36cfca345d24bc31f3e98d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid creating empty files when one side of a diff is empty; ok tracey
- Commit:
ac9e7fddf6c391bfdce7428c3775968b488f9e3d
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
create temporary workaround to opening /dev/null during diffing.
this will need to be reworked later. ok stsp
- Commit:
303e14b5e91b152d78219ff8bbca1f9bfbbb094e
- From:
- Steven McDonald <steven@steven-mcdonald.id.au>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
Add missing includes for time() and ctime()
These headers were implicitly used on OpenBSD, but building on Linux
revealed that <time.h> wasn't included directly. diffreg.c uses
ctime(), which additionally needs <sys/types.h>.