Author: rinrab
Date: Mon Dec 23 14:42:38 2024
New Revision: 1922647
URL: http://svn.apache.org/viewvc?rev=1922647&view=rev
Log:
Follow-up to r1921602: Fix argument sequence of svn_client__get_diff_writer_svn
to much its declaration with its implementation.
When the use_git_diff_format argument was introduced to the function, it was
added incorrectly to its declaration. This commit adjust the
declaration to the implementation. The sequence of args used in the
implementation is more correct, because it repeats the svn_client_diff7
family.
* subversion/include/private/svn_client_private.h
(svn_client__get_diff_writer_svn): Swap use_git_diff_format and
pretty_print_mergeinfo args.
* subversion/svn/shelf-cmd.c
(shelf_diff): Update the usage to fit with the updated function.
* subversion/svn/shelf2-cmd.c
(shelf_diff): Ditto.
Modified:
subversion/trunk/subversion/include/private/svn_client_private.h
subversion/trunk/subversion/svn/shelf-cmd.c
subversion/trunk/subversion/svn/shelf2-cmd.c
Modified: subversion/trunk/subversion/include/private/svn_client_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_private.h?rev=1922647&r1=1922646&r2=1922647&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Mon Dec 23
14:42:38 2024
@@ -375,8 +375,8 @@ svn_client__get_diff_writer_svn(
svn_boolean_t ignore_content_type,
svn_boolean_t ignore_properties,
svn_boolean_t properties_only,
- svn_boolean_t pretty_print_mergeinfo,
svn_boolean_t use_git_diff_format,
+ svn_boolean_t pretty_print_mergeinfo,
const char *header_encoding,
svn_stream_t *outstream,
svn_stream_t *errstream,
Modified: subversion/trunk/subversion/svn/shelf-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/shelf-cmd.c?rev=1922647&r1=1922646&r2=1922647&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/shelf-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelf-cmd.c Mon Dec 23 14:42:38 2024
@@ -769,8 +769,8 @@ shelf_diff(const char *name,
FALSE /*ignore_content_type*/,
FALSE /*ignore_properties*/,
FALSE /*properties_only*/,
- TRUE /*pretty_print_mergeinfo*/,
FALSE /*use_git_diff_format*/,
+ TRUE /*pretty_print_mergeinfo*/,
svn_cmdline_output_encoding(scratch_pool),
stream, errstream,
ctx, scratch_pool));
Modified: subversion/trunk/subversion/svn/shelf2-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/shelf2-cmd.c?rev=1922647&r1=1922646&r2=1922647&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/shelf2-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelf2-cmd.c Mon Dec 23 14:42:38 2024
@@ -769,8 +769,8 @@ shelf_diff(const char *name,
FALSE /*ignore_content_type*/,
FALSE /*ignore_properties*/,
FALSE /*properties_only*/,
- TRUE /*pretty_print_mergeinfo*/,
FALSE /*use_git_diff_format*/,
+ TRUE /*pretty_print_mergeinfo*/,
svn_cmdline_output_encoding(scratch_pool),
stream, errstream,
ctx, scratch_pool));
