svn commit: r1921602 - in /subversion/trunk/subversion: include/private/svn_client_private.h libsvn_client/diff.c svn/shelf-cmd.c svn/shelf2-cmd.c

Author: rinrab
Date: Sun Oct 27 19:53:54 2024
New Revision: 1921602

URL: http://svn.apache.org/viewvc?rev=1921602&view=rev
Log:
Add missing use_git_diff_format argument to the svn_client__get_diff_writer_svn()
function.

All the other arguments are already exist in this function and are passed
to get_diff_processor(), but use_git_diff_format is the last missing.

No deprecation is required, since this function is private.

* subversion/include/private/svn_client_private.h
  (svn_client__get_diff_writer_svn): Add use_git_diff_format boolean
   argument to the declaration.
* subversion/libsvn_client/diff.c
  (svn_client__get_diff_writer_svn): Add use_git_diff_format and pass it
   to get_diff_processor().
* subversion/svn/shelf-cmd.c,
  subversion/svn/shelf2-cmd.c
  (): Update usages of svn_client__get_diff_writer_svn() to always pass
   FALSE as use_git_diff_format argument.

Modified:
    subversion/trunk/subversion/include/private/svn_client_private.h
    subversion/trunk/subversion/libsvn_client/diff.c
    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=1921602&r1=1921601&r2=1921602&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Sun Oct 27 19:53:54 2024
@@ -371,6 +371,7 @@ svn_client__get_diff_writer_svn(
                 svn_boolean_t ignore_properties,
                 svn_boolean_t properties_only,
                 svn_boolean_t pretty_print_mergeinfo,
+                svn_boolean_t use_git_diff_format,
                 const char *header_encoding,
                 svn_stream_t *outstream,
                 svn_stream_t *errstream,

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1921602&r1=1921601&r2=1921602&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sun Oct 27 19:53:54 2024
@@ -2690,6 +2690,7 @@ 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 use_git_diff_format,
                 svn_boolean_t pretty_print_mergeinfo,
                 const char *header_encoding,
                 svn_stream_t *outstream,
@@ -2708,7 +2709,7 @@ svn_client__get_diff_writer_svn(
                              ignore_content_type,
                              ignore_properties,
                              properties_only,
-                             FALSE /*use_git_diff_format*/,
+                             use_git_diff_format,
                              pretty_print_mergeinfo,
                              header_encoding,
                              outstream, errstream,

Modified: subversion/trunk/subversion/svn/shelf-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/shelf-cmd.c?rev=1921602&r1=1921601&r2=1921602&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/shelf-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelf-cmd.c Sun Oct 27 19:53:54 2024
@@ -769,6 +769,7 @@ shelf_diff(const char *name,
                 FALSE /*ignore_properties*/,
                 FALSE /*properties_only*/,
                 TRUE /*pretty_print_mergeinfo*/,
+                FALSE /*use_git_diff_format*/,
                 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=1921602&r1=1921601&r2=1921602&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/shelf2-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelf2-cmd.c Sun Oct 27 19:53:54 2024
@@ -769,6 +769,7 @@ shelf_diff(const char *name,
                 FALSE /*ignore_properties*/,
                 FALSE /*properties_only*/,
                 TRUE /*pretty_print_mergeinfo*/,
+                FALSE /*use_git_diff_format*/,
                 svn_cmdline_output_encoding(scratch_pool),
                 stream, errstream,
                 ctx, scratch_pool));