Author: rinrab
Date: Sun Oct 27 20:42:48 2024
New Revision: 1921609
URL: http://svn.apache.org/viewvc?rev=1921609&view=rev
Log:
Use the svn_client__get_diff_writer_svn function instead of
get_diff_processor, since they no longer differ.
* subversion/libsvn_client/diff.c
(svn_client_diff7, svn_client_diff_peg7): Ditto.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1921609&r1=1921608&r2=1921609&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sun Oct 27 20:42:48 2024
@@ -2789,20 +2789,20 @@ svn_client_diff7(const apr_array_header_
if (show_copies_as_adds || use_git_diff_format)
ignore_ancestry = FALSE;
- SVN_ERR(get_diff_processor(&diff_processor, &ddi,
- options,
- relative_to_dir,
- no_diff_added,
- no_diff_deleted,
- show_copies_as_adds,
- ignore_content_type,
- ignore_properties,
- properties_only,
- use_git_diff_format,
- pretty_print_mergeinfo,
- header_encoding,
- outstream, errstream,
- ctx, pool));
+ SVN_ERR(svn_client__get_diff_writer_svn(&diff_processor, &ddi,
+ options,
+ relative_to_dir,
+ no_diff_added,
+ no_diff_deleted,
+ show_copies_as_adds,
+ ignore_content_type,
+ ignore_properties,
+ properties_only,
+ use_git_diff_format,
+ pretty_print_mergeinfo,
+ header_encoding,
+ outstream, errstream,
+ ctx, pool));
return svn_error_trace(do_diff(ddi,
path_or_url1, path_or_url2,
@@ -2849,20 +2849,20 @@ svn_client_diff_peg7(const apr_array_hea
if (show_copies_as_adds || use_git_diff_format)
ignore_ancestry = FALSE;
- SVN_ERR(get_diff_processor(&diff_processor, &ddi,
- options,
- relative_to_dir,
- no_diff_added,
- no_diff_deleted,
- show_copies_as_adds,
- ignore_content_type,
- ignore_properties,
- properties_only,
- use_git_diff_format,
- pretty_print_mergeinfo,
- header_encoding,
- outstream, errstream,
- ctx, pool));
+ SVN_ERR(svn_client__get_diff_writer_svn(&diff_processor, &ddi,
+ options,
+ relative_to_dir,
+ no_diff_added,
+ no_diff_deleted,
+ show_copies_as_adds,
+ ignore_content_type,
+ ignore_properties,
+ properties_only,
+ use_git_diff_format,
+ pretty_print_mergeinfo,
+ header_encoding,
+ outstream, errstream,
+ ctx, pool));
return svn_error_trace(do_diff(ddi,
path_or_url, path_or_url,
