Commits
- Commit:
9403a358855aa5ba3ec2f3f20943215e1d758496
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug fix after changing result->left,right to pointers
- Commit:
c16dde50bb5e92533dcbbc513875d726f0f9dd48
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow diff API users to atomize files separately
This is a breaking API change (not that we care about that at this point).
This can avoid redundant work spent on atomizing a file multiple times.
There are use cases where one particular file must be compared to other
files over and over again, such as when blaming file history.
The old API gave access to both versions of the file to the atomizer just
in case a future atomizer implementation needs this. This can still be
achieved by passing a second file via the atomizer's private data pointer.
- Commit:
f486745273f4d3c8f6b15d7041d7ab5b3e58b071
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't require both + and - chunks in diff_chunk_context_load_change()
- Commit:
13e2caa3edcc68a62e29b4d5503254cd5bf80b2b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for showing function prototypes in unidiff hunk headers
- Commit:
7187fe972091ffb934d90ab11967d006868f8d7c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add diff_chunk_context_load_change() for use with diff_output_unidiff_chunk()
- Commit:
2f26640c77e9b4d1a303b6c3c7776ff75ad51111
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
revert db941c24; callers would also need private structs for that idea to work
- Commit:
66ea8e5adfb496de581ba4b78479f3258692ee9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid printing the --- +++ diff header in diff_output_unidiff_chunk()
- 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.
- Commit:
cbf93b702bb81f143354b53125c64579a5040fcc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
expose chunk_context_empty() via diff_internal.h and use it in edscript output
- 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.
- Commit:
26595c7df947f97507904fa391034b6a52bfca7d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in ed output mode, show changed lines as XXcYY etc. as UNIX diff(1) does
- Commit:
5ff759965efbabc96fecd514e208a9a1b7be72df
- From:
- Neels Hofmeyr <neels@hofmeyr.de>
- Date:
debug: diff_output_unidiff(): debug list all chunks
- Commit:
d2dfa2ecef800c3522c233c56c05b8a91f859fe0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix unidiff output header in case both files have only one line
- Commit:
11d9f2f72df165e4dbfdabac9708d307aa61cab3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix unidiff headers for empty files
- Commit:
b6adedb6f92219b3795f616b46f18e752c5644be
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix line numbers in unidiff hunk headers and omit ",1"; matches diff(1)
- Commit:
1dfba0555efd6b616811906d011f96945be90dcc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move headers from include/diff/ to include/; makes things easier for consumers
- Commit:
fe8af0d6c0a2ba7f1c50f0b88cd7e13d784d2e23
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add helper functions for obtaining the start/end line numbers of a diff chunk
- Commit:
2a1b94d029d73b14949971a9f159da4670584ee9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
repair DEBUG build
- Commit:
ab528e220f57a9cc557919a18aca8d39327ad207
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove an unused variable
- Commit:
dabc100859385b31dcfbe62d04187d6947a12795
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check results of ARRAYLIST_ADD
- Commit:
2c20a3ed9d3c979c38e927387d4ea488e4dd631b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
optionally provide information about the generated diff to the API user
- Commit:
11caa5ccb607f41d22b4d2a7630952c0cdd08336
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store interal state of output_unidiff API in an opaque struct
- Commit:
85ab45596727cfd0254c6d5b6f0c5705b7b6e89e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move some definitions from the public diff_main.h to an internal header file
- Commit:
f374e91343146fc0584d53f4b767a3ebfe7bc49e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
support output of individual diff chunks in the public API
- Commit:
e4464189bc895121565a7a02eef98262343e6e24
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename 'debug.h' to 'diff_debug.h'