Commits
Commit:
f46fa9b5e78156c0360f508336dbe3dfa04b503f
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
Thu May 11 20:59:55 2023 UTC
do not treat \r\n line endings as special Previously, we would go out of our way to handle both \n and \r\n line endings as equivalent. However, for files with \r\n line endings, this results in diffs that omit the final \r and therefore cannot be applied with patch(1) on Unix platforms. ok stsp
Commit:
e78a8d73c23ee314fdbdf110d5c55866c9ef9680
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Mon Feb 20 12:29:07 2023 UTC
make diff_chunk_type() public and clarify comment As discussed with stsp, reword an easily misunderstood comment, and move diff_chunk_type() into the public diff API to improve caller efficiency. ok stsp@
Commit:
f26db7cd2804ebc6a3f81e7e00e008450eb42228
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Mon Feb 20 03:59:45 2023 UTC
add public APIs to enable chunk byte offset retrieval Prompted by changes to conflict marker detection in got.git, add chunk offset getters for both left- and right-hand side files. This facilitates more efficient caller diff_result use by directly seeking to a given chunk rather than counting lines. ok stsp@
Commit:
1dce05e8f99e9ab3e9229bf59e061ad0201a08e8
From:
Omar Polo <op@omarpolo.com>
Date:
Thu Nov 17 11:24:43 2022 UTC
always cast ctype' is*() arguments to unsigned char Almost all had already an unsigned argument (uint8_t or unsigned char), but cast anyway in case the types are changed in the future. ok stsp@
Commit:
29c010c8648ec861ee463bc8fa8c66a64dd01154
From:
Stefan Sperling <stsp@stsp.name>
Date:
Thu Nov 3 21:40:18 2022 UTC
c99-only construct is not good on OpenBSD's old gcc; patch by Ted Bullock
Commit:
674563ab136a2aa34dc4d93043d92235a2ae98ba
From:
Tom Jones <thj@freebsd.org>
Via:
tj <tj@enoti.me>
Date:
Tue Oct 11 15:01:17 2022 UTC
Don't return errno when fread fails fread doesn't consistently set errno on failure. - On OpenBSD fread sets errno on possible argument overflows, but this doesn't occur on other platforms. rfread doesn't set errno on EOF or other failures. - ferror does not set errno on failure. Returning errno here is possibly inconsistent. Return EIO here instead. ok stsp@
Commit:
92698c5e983ce2fa59780f5567cb34283bcf1095
From:
Tom Jones <thj@freebsd.org>
Via:
tj <tj@enoti.me>
Date:
Tue Oct 11 15:00:34 2022 UTC
Remove duplicate definitions ok op@
Commit:
c737b93b775d30d7ec96867c4410e122e6167b95
From:
Tom Jones <thj@freebsd.org>
Via:
tj <tj@enoti.me>
Date:
Tue Oct 11 14:59:40 2022 UTC
fread cannot return -1 fread returns a size_t and can never be -1. fread can signal parameter errors on some platforms, but this isn't portable. Remove this check and break out of the loop when fread returns 0. ok op@
Commit:
4125b1eff8d9dfcd961dc70ebbd5d54c97bdc3f6
From:
Tom Jones <thj@freebsd.org>
Via:
tj <tj@enoti.me>
Date:
Mon Oct 10 13:15:27 2022 UTC
diff: handle missing new lines in trailing context If there is a missing new line in the context we currently miss it and fail to print the warning. This trips up patch and leads to failures. Catch these cases in for unidiff output and add a test case. ok stsp@
Commit:
9f5da0913af47a525ab2a2422c7911cdb08866d0
From:
Tom Jones <thj@freebsd.org>
Via:
tj <tj@enoti.me>
Date:
Mon Oct 10 12:44:37 2022 UTC
diff: Add API for consumers to check if diff is printable Programs using the libdiff API they can need to know if the diff contained anything that would be printed, or would be empty. Expose the same check that the output functions do as a function call. ok stsp@
Commit:
e1595dc1c75393361878450cc70fcefee131810a
From:
Tom Jones <thj@freebsd.org>
Via:
Mark Jamsek <mark@jamsek.dev>
Date:
Fri Sep 23 14:39:14 2022 UTC
add regress test for function prototype in hunk header
Commit:
1edd9c2b609adfa7ed93dbd839b7d683e695feaa
From:
Stefan Sperling <stsp@stsp.name>
Date:
Fri Sep 23 14:31:52 2022 UTC
sync changes from got.git to implement headers-only mode for plain output
Commit:
8993f42562696079866fc2dec7191877b6cc1f18
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Fri Sep 23 14:20:33 2022 UTC
improve accuracy of function prototype in hunk headers Initial diff by Tom Jones with fixes from stsp. ok stsp@
Commit:
9230203d371721cf5bde99f526fe40740aea3b21
From:
Stefan Sperling <stsp@stsp.name>
Date:
Fri Sep 2 09:21:04 2022 UTC
fix updating of line-offsets output info in plain output mode reviewed by tom jones
Commit:
810479a563ffd6176105f64cb49f9829d45d36df
From:
Stefan Sperling <stsp@stsp.name>
Date:
Fri Sep 2 08:26:11 2022 UTC
sync diff_patience.c from got.git 336075a42a5ae0fa322db734c481d21998e82bb8
Commit:
1f690ebe65383786882e120daa2cba81a7b7f90e
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Wed Aug 31 23:08:53 2022 UTC
sync files from got.git 336075a42a5ae0fa322db734c481d21998e82bb8 ok tb@
Commit:
7a38b3a33f8b124c9c01da154dfdf711d328b01d
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Wed Aug 31 23:08:53 2022 UTC
fix build broken in previous commit 35eae7fa6b782ae1 Macro line was wrapped without continuation character. ok tb@
Commit:
35eae7fa6b782ae1d000183ef2efc4383dfec4cd
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Wed Aug 31 12:53:56 2022 UTC
remove gcc ternary if extension ok stsp@
Commit:
b1aa94aab8c556c9614a18b8e13c6cc8c3005b79
From:
Tom Jones <thj@freebsd.org>
Via:
Stefan Sperling <stsp@stsp.name>
Date:
Tue Aug 30 15:30:02 2022 UTC
add support for classic diff(1) output; patch by Tom Jones
Commit:
9343b92549173e00690f24756a633423770f56d7
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Thu Aug 4 11:23:55 2022 UTC
collect line type metadata when generating diff Similar to line offsets, create an array of line types (i.e., hunk, context, minus, plus) for each line output in the diff. ok stsp@
Commit:
e450035c854c7301e281718ffd136dfe4647e681
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Thu Aug 4 11:12:21 2022 UTC
sync files from got.git 58e31a80da4f4a9e10eaea148672190f35107a47 ok stsp@
Commit:
f8b2e31e52e55c61466d35304412e919227e6ae9
From:
Stefan Sperling <stsp@stsp.name>
Date:
Wed Aug 3 11:36:37 2022 UTC
revert previous; got lib/blame.c needs diff_atom_hash_update()
Commit:
f400825bc668466d9fc593470514d6e69ddfc5ff
From:
Omar Polo <op@omarpolo.com>
Date:
Wed Aug 3 07:08:26 2022 UTC
make diff_atom_hash_update private to diff_atomize_text.c ok stsp@
Commit:
cd9ef01a441e0ecfd499bf907c15a2878f7e0ee2
From:
Omar Polo <op@omarpolo.com>
Date:
Wed Aug 3 07:08:26 2022 UTC
reuse diff_atom_hash_update ok stsp@
Commit:
b9efd927c001e0ea11fac039d1d0849bcad14cab
From:
Omar Polo <op@omarpolo.com>
Date:
Wed Aug 3 07:08:26 2022 UTC
less chatty regress ok stsp@
Game of Trees