Commits

Commit:
7187fe972091ffb934d90ab11967d006868f8d7c
From:
Stefan Sperling <stsp@stsp.name>
Date:
add diff_chunk_context_load_change() for use with diff_output_unidiff_chunk()
diff | patch | tree
Commit:
2f26640c77e9b4d1a303b6c3c7776ff75ad51111
From:
Stefan Sperling <stsp@stsp.name>
Date:
revert db941c24; callers would also need private structs for that idea to work
diff | patch | tree
Commit:
66ea8e5adfb496de581ba4b78479f3258692ee9e
From:
Stefan Sperling <stsp@stsp.name>
Date:
avoid printing the --- +++ diff header in diff_output_unidiff_chunk()
diff | patch | tree
Commit:
db941c245fd5f7b8e8ca2f9b6ebaf0c3dcecda48
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
cbf93b702bb81f143354b53125c64579a5040fcc
From:
Stefan Sperling <stsp@stsp.name>
Date:
expose chunk_context_empty() via diff_internal.h and use it in edscript output
diff | patch | tree
Commit:
7021523c6d7788c452572f0b48f0dcba23199dac
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
26595c7df947f97507904fa391034b6a52bfca7d
From:
Stefan Sperling <stsp@stsp.name>
Date:
in ed output mode, show changed lines as XXcYY etc. as UNIX diff(1) does
diff | patch | tree
Commit:
5ff759965efbabc96fecd514e208a9a1b7be72df
From:
Neels Hofmeyr <neels@hofmeyr.de>
Date:
debug: diff_output_unidiff(): debug list all chunks
diff | patch | tree
Commit:
d2dfa2ecef800c3522c233c56c05b8a91f859fe0
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unidiff output header in case both files have only one line
diff | patch | tree
Commit:
11d9f2f72df165e4dbfdabac9708d307aa61cab3
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unidiff headers for empty files
diff | patch | tree
Commit:
b6adedb6f92219b3795f616b46f18e752c5644be
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix line numbers in unidiff hunk headers and omit ",1"; matches diff(1)
diff | patch | tree
Commit:
1dfba0555efd6b616811906d011f96945be90dcc
From:
Stefan Sperling <stsp@stsp.name>
Date:
move headers from include/diff/ to include/; makes things easier for consumers
diff | patch | tree
Commit:
fe8af0d6c0a2ba7f1c50f0b88cd7e13d784d2e23
From:
Stefan Sperling <stsp@stsp.name>
Date:
add helper functions for obtaining the start/end line numbers of a diff chunk
diff | patch | tree
Commit:
2a1b94d029d73b14949971a9f159da4670584ee9
From:
Stefan Sperling <stsp@stsp.name>
Date:
repair DEBUG build
diff | patch | tree
Commit:
ab528e220f57a9cc557919a18aca8d39327ad207
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove an unused variable
diff | patch | tree
Commit:
dabc100859385b31dcfbe62d04187d6947a12795
From:
Stefan Sperling <stsp@stsp.name>
Date:
check results of ARRAYLIST_ADD
diff | patch | tree
Commit:
2c20a3ed9d3c979c38e927387d4ea488e4dd631b
From:
Stefan Sperling <stsp@stsp.name>
Date:
optionally provide information about the generated diff to the API user
diff | patch | tree
Commit:
11caa5ccb607f41d22b4d2a7630952c0cdd08336
From:
Stefan Sperling <stsp@stsp.name>
Date:
store interal state of output_unidiff API in an opaque struct
diff | patch | tree
Commit:
85ab45596727cfd0254c6d5b6f0c5705b7b6e89e
From:
Stefan Sperling <stsp@stsp.name>
Date:
move some definitions from the public diff_main.h to an internal header file
diff | patch | tree
Commit:
f374e91343146fc0584d53f4b767a3ebfe7bc49e
From:
Stefan Sperling <stsp@stsp.name>
Date:
support output of individual diff chunks in the public API
diff | patch | tree
Commit:
e4464189bc895121565a7a02eef98262343e6e24
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename 'debug.h' to 'diff_debug.h'
diff | patch | tree
Commit:
8546b0450f31c11e9433f5d5c6dc1d79c86107ed
From:
Neels Hofmeyr <neels@hofmeyr.de>
Date:
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
Commit:
e10a628aa1d46df600ffc7194d35f67416eaefdd
From:
Stefan Sperling <stsp@stsp.name>
Date:
avoid include statements in header files; make each .c pull in what's needed
diff | patch | tree
Commit:
3e6cba3a54789e151b37851eef9cdccc4180ae40
From:
Stefan Sperling <stsp@stsp.name>
Date:
replace enum diff_rc errors with plain errno values
diff | patch | tree
Commit:
d362ea2e854f8c315f7f54d125439540e0649383
From:
Stefan Sperling <stsp@stsp.name>
Date:
move 'struct range' and related functions into the diff_ namespace no functional change
diff | patch | tree