Commit Briefs

Stefan Sperling

put functions required for using diff_output_unidiff_chunk() into public API

They will be needed to implement 'got stage -p' and 'got revert -p', etc. Chunks stored in diff_result still need post-processing in order to be displayed as expected by diff_output_unidiff_chunk(). Exposing these functions allows API consumers to implement the same chunk merging loop as used internally by output_unidiff() and output_edscript(). (Perhaps, ideally, the public diff API would provide pre-merged chunks at some point in the future? Then this commit could probably be reverted.) Change return values from bool to int to avoid making stdbool.h a requirement for the public diff API.

diff | patch | tree

Stefan Sperling

expose chunk_context_empty() via diff_internal.h and use it in edscript output

diff | patch | tree

Stefan Sperling

print "\ No newline at end of file" message like UNIX diff(1) does

Not adding new tests since this behaviour is covered by tests in Got.

diff | patch | tree

Stefan Sperling

in ed output mode, show changed lines as XXcYY etc. as UNIX diff(1) does

diff | patch | tree

Neels Hofmeyr

debug: diff_output_unidiff(): debug list all chunks

diff | patch | tree

Stefan Sperling

fix unidiff output header in case both files have only one line

diff | patch | tree

Stefan Sperling

fix unidiff headers for empty files

diff | patch | tree

Stefan Sperling

fix line numbers in unidiff hunk headers and omit ",1"; matches diff(1)

diff | patch | tree

Stefan Sperling

move headers from include/diff/ to include/; makes things easier for consumers

diff | patch | tree

Stefan Sperling

add helper functions for obtaining the start/end line numbers of a diff chunk

diff | patch | tree

Stefan Sperling

repair DEBUG build

diff | patch | tree

Stefan Sperling

remove an unused variable

diff | patch | tree

Stefan Sperling

check results of ARRAYLIST_ADD

diff | patch | tree

Stefan Sperling

optionally provide information about the generated diff to the API user

diff | patch | tree

Stefan Sperling

store interal state of output_unidiff API in an opaque struct

diff | patch | tree

Stefan Sperling

move some definitions from the public diff_main.h to an internal header file

diff | patch | tree

Stefan Sperling

support output of individual diff chunks in the public API

diff | patch | tree

Stefan Sperling

rename 'debug.h' to 'diff_debug.h'

diff | patch | tree

Neels Hofmeyr

diff result: ensure sane order of result chunks

Ensure that a adjacent chunks of same type are combined, and that a minus block always precedes an adjacent plus block. The upcoming myers-divide optimization is prone to produce weird ordering of plus and minus chunks.

diff | patch | tree

Stefan Sperling

avoid include statements in header files; make each .c pull in what's needed

diff | patch | tree

Stefan Sperling

replace enum diff_rc errors with plain errno values

diff | patch | tree

Stefan Sperling

move 'struct range' and related functions into the diff_ namespace

no functional change

diff | patch | tree

Neels Hofmeyr

KNF: use max 80 columns

diff | patch | tree

Neels Hofmeyr

KNF: function declaration return types on separate line

diff | patch | tree

Neels Hofmeyr

remove code dup of diff_main() invocation for plain vs unidiff

diff | patch | tree