Split the diff library in logical chunks. First pass at cleaning up the API.
Update all callers.
* subversion/include/svn_diff.h
Remove all spaces before the opening paren to gain consistency.
(svn_diff_diff): Renamed from svn_diff.
(svn_diff_diff3): Renamed from svn_diff3.
(svn_diff_diff4): Renamed from svn_diff4.
(svn_diff_file_diff): Renamed from svn_diff_file.
(svn_diff_file_diff3): Renamed from svn_diff3_file.
(svn_diff_file_diff4): Renamed from svn_diff4_file.
(svn_diff_file_output_merge): Renamed from svn_diff3_file_output.
* subversion/libsvn_diff/token.c
New file to contain all token tree helper functions.
(svn_diff__tree_create, svn_diff__tree_insert_token, svn_diff__get_tokens):
Moved from subversion/libsvn_diff/diff.c.
* subversion/libsvn_diff/lcs.c
New file to contain the LCS implementation, which is the core of the
entire library.
(svn_diff__snake, svn_diff__lcs_reverse, svn_diff__lcs):
Moved from subversion/libsvn_diff/diff.c.
* subversion/libsvn_diff/diff_file.c
Update all calls to the renamed functions.
(svn_diff_file_diff): Renamed from svn_diff_file.
(svn_diff_file_diff3): Renamed from svn_diff3_file.
(svn_diff_file_diff4): Renamed from svn_diff4_file.
(svn_diff_file_output_merge): Renamed from svn_diff3_file_output.
* subversion/libsvn_diff/diff.c
(svn_diff__tree_create, svn_diff__tree_insert_token, svn_diff__get_tokens):
Moved to subversion/libsvn_diff/token.c.
(svn_diff__snake, svn_diff__lcs_reverse, svn_diff__lcs):
Moved to subversion/libsvn_diff/lcs.c.
(svn_diff__diff): Export.
(svn_diff_diff): Renamed from svn_diff.
(svn_diff__resolve_conflict, svn_diff3):
Moved to subversion/libsvn_diff/diff3.c.
(svn_diff__adjust_hunk, svn_diff__adjust, svn_diff4):
Moved to subversion/libsvn_diff/diff4.c.
(svn_diff_contains_conflicts, svn_diff_contains_diffs, svn_diff_output):
Moved to subversion/libsvn_diff/util.c.
* subversion/libsvn_diff/libsvn_diff.dsp
Add lcs.c, token.c, util.c, diff3.c, diff4.c and diff.h.
* subversion/libsvn_diff/diff3.c
(svn_diff__resolve_conflict): Moved from subversion/libsvn_diff/diff.c.
(svn_diff_diff3): Same. Renamed from svn_diff3.
* subversion/libsvn_diff/diff4.c
(svn_diff__adjust_hunk, svn_diff__adjust):
Moved from subversion/libsvn_diff/diff.c.
(svn_diff_diff4): Same. Renamed from svn_diff4.
* subversion/libsvn_diff/diff.h
New private header file that declares all structs and functions needed
internally by the diff library.
* subversion/libsvn_diff/util.c
New file to contain all (public) utility functions.
(svn_diff_contains_conflicts, svn_diff_contains_diffs, svn_diff_output):
Moved from subversion/libsvn_diff/diff.c.
* subversion/libsvn_wc/merge.c
(svn_wc_merge): Update calls to svn_diff_file_diff3 and
svn_diff_output_merge.
* subversion/libsvn_client/diff.c
(diff_file_changed): Update calls to svn_diff_file_diff.
* subversion/tests/libsvn_diff/diff-diff3-test.c
(three_way_merge): Update calls to svn_diff_file_diff3 and
svn_diff_file_output_merge.
(two_way_diff): Update calls to svn_diff_file_diff.
* subversion/tests/libsvn_diff/diff-test.c
(do_diff): Update calls to svn_diff_file_diff.
* subversion/tests/libsvn_diff/diff3-test.c
(do_diff3): Update calls to svn_diff_file_diff3 and
svn_diff_file_output_merge.
* subversion/tests/libsvn_diff/diff4-test.c
(do_diff4): Update calls to svn_diff_file_diff4 and
svn_diff_file_output_merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@845696 13f79535-47bb-0310-9956-ffa450edef68
16 files changed
