svn commit: r1703839 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Fri Sep 18 13:20:23 2015
New Revision: 1703839

URL: http://svn.apache.org/viewvc?rev=1703839&view=rev
Log:
Continue removing svn_cl__interactive_conflict_baton_t from 'svn' conflict code.

Instead of passing the baton around, pass individual parameters based on
data in the baton.

* subversion/svn/conflict-callbacks.c
  (edit_prop_conflict): Accept 'editor_cmd', 'config', and 'pb' parameters
   instead of svn_cl__interactive_conflict_baton_t.
  (handle_prop_conflict): Update caller.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1703839&r1=1703838&r2=1703839&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Sep 18 13:20:23 2015
@@ -377,7 +377,9 @@ edit_prop_conflict(const svn_string_t **
                    const svn_string_t *base_propval,
                    const svn_string_t *my_propval,
                    const svn_string_t *their_propval,
-                   svn_cl__interactive_conflict_baton_t *b,
+                   const char *editor_cmd,
+                   apr_hash_t *config,
+                   svn_cmdline_prompt_baton_t *pb,
                    apr_pool_t *result_pool,
                    apr_pool_t *scratch_pool)
 {
@@ -393,13 +395,13 @@ edit_prop_conflict(const svn_string_t **
                                          scratch_pool);
   SVN_ERR(merge_prop_conflict(merged_prop, base_propval, my_propval,
                               their_propval, NULL,
-                              b->pb->cancel_func,
-                              b->pb->cancel_baton,
+                              pb->cancel_func,
+                              pb->cancel_baton,
                               scratch_pool));
   SVN_ERR(svn_stream_close(merged_prop));
   SVN_ERR(svn_io_file_flush(file, scratch_pool));
-  SVN_ERR(open_editor(&performed_edit, file_path, b->editor_cmd,
-                      b->config, scratch_pool));
+  SVN_ERR(open_editor(&performed_edit, file_path, editor_cmd,
+                      config, scratch_pool));
   if (performed_edit && merged_propval)
     {
       svn_stringbuf_t *buf;
@@ -1117,7 +1119,8 @@ handle_prop_conflict(svn_client_conflict
         {
           SVN_ERR(edit_prop_conflict(&merged_propval,
                                      base_propval, my_propval, their_propval,
-                                     b, result_pool, scratch_pool));
+                                     b->pb, b->editor_cmd, b->config,
+                                     result_pool, scratch_pool));
           resolved_allowed = (merged_propval != NULL);
         }
       else if (strcmp(opt->code, "r") == 0)