Commit Briefs

4125b1eff8 tj

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@

diff | patch | tree

9f5da0913a tj

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@

diff | patch | tree

e1595dc1c7 Mark Jamsek

add regress test for function prototype in hunk header

diff | patch | tree

1edd9c2b60 Stefan Sperling

sync changes from got.git to implement headers-only mode for plain output

diff | patch | tree

8993f42562 Mark Jamsek

improve accuracy of function prototype in hunk headers

Initial diff by Tom Jones with fixes from stsp. ok stsp@

diff | patch | tree

9230203d37 Stefan Sperling

fix updating of line-offsets output info in plain output mode

reviewed by tom jones

diff | patch | tree

810479a563 Stefan Sperling

sync diff_patience.c from got.git 336075a42a5ae0fa322db734c481d21998e82bb8

diff | patch | tree

1f690ebe65 Mark Jamsek

sync files from got.git 336075a42a5ae0fa322db734c481d21998e82bb8

ok tb@

diff | patch | tree

7a38b3a33f Mark Jamsek

fix build broken in previous commit 35eae7fa6b782ae1

Macro line was wrapped without continuation character. ok tb@

diff | patch | tree

35eae7fa6b Mark Jamsek

remove gcc ternary if extension

ok stsp@

diff | patch | tree

b1aa94aab8 Stefan Sperling

add support for classic diff(1) output; patch by Tom Jones

diff | patch | tree

9343b92549 Mark Jamsek

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@

diff | patch | tree

e450035c85 Mark Jamsek

sync files from got.git 58e31a80da4f4a9e10eaea148672190f35107a47

ok stsp@

diff | patch | tree

f8b2e31e52 Stefan Sperling

revert previous; got lib/blame.c needs diff_atom_hash_update()

diff | patch | tree

f400825bc6 Omar Polo

make diff_atom_hash_update private to diff_atomize_text.c

ok stsp@

diff | patch | tree

cd9ef01a44 Omar Polo

reuse diff_atom_hash_update

ok stsp@

diff | patch | tree

b9efd927c0 Omar Polo

less chatty regress

ok stsp@

diff | patch | tree

9bf4a819c3 Omar Polo

regress: look for the diff prog also inside obj/

ok stsp@

diff | patch | tree

405e89a6da Omar Polo

adjust the expected output so that regress passes again

Note that test015 is still broken on OpenBSD with base patch(1). ok stsp@

diff | patch | tree

3a15e1807a Mark Jamsek

ARRAY_LIST allocation optimisation

Rather than realloc in fixed-sized blocks, use the 1.5 * allocated scheme when growing the array. This produces fewer allocations and up to 3x speedup on large diffs. ok stsp@

diff | patch | tree

ed9312f04b Omar Polo

fix accounting for line endings in CRLF files

There are two different subtles error in computing the end of line in diff_data_atomize_text_lines (one in per implementation, _fd and _mmap) that causes the '\n' of the '\r\n' case to be left out the current line. It causes strange bugs when diffing CRLF files, such as printing the "\ No newline at end of file" marker very often and showing the wrong offsets in the hunk headers. ok stsp@

diff | patch | tree

b72f51ffc3 Stefan Sperling

add missing line offset information for unidiff output

We forgot to generate line offset information for lines of the form: "Binary files %s and %s differ" Which is causing scrolling problems in tog's diff view. ok thomas_adam

diff | patch | tree

f1dbec24f9 Stefan Sperling

fix a size_t multiplication overflow in diff_meyrs.c

Found on an OpenBSD armv7 machine running Got regression tests: test_status_shows_no_mods_after_complete_merge Segmentation fault (core dumped) The problematic multiplication is kd_len * kd_len in diff_algo_myers() with kd_len set to 65537. (gdb) p (int)(65537 * 65537) $64 = 131073 (gdb) p (int)(65537 + 65537) $65 = 131074 (gdb) p (unsigned int)(size_t)(-1) $68 = 4294967295 (gdb) p (4294967295 / kd_len) $71 = 65535 Detect such overflow and run the fallback diff algorithm instead.

diff | patch | tree

346d498656 Stefan Sperling

fix ed script diff output when lines are inserted at the top of a file

diff | patch | tree

9879b82a58 Stefan Sperling

avoid writing just one character at a time in diff_output_lines()

With input from ori@ and millert@

diff | patch | tree