subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1417932 - in /subversion/trunk/subversion/libsvn_wc: externals.c merge.c props.c props.h update_editor.c
Date Thu, 06 Dec 2012 15:11:09 GMT
Author: julianfoad
Date: Thu Dec  6 15:11:07 2012
New Revision: 1417932

URL: http://svn.apache.org/viewvc?rev=1417932&view=rev
Log:
Remove the cancellation parameters from svn_wc__merge_props(). We don't need
to be able to cancel at this granularity, and this function no longer
performs any I/O.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Remove 'cancel_func' and 'cancel_baton' parameters.
  (svn_wc__perform_props_merge): Track the change.

* subversion/libsvn_wc/props.h
  (svn_wc__merge_props): Remove 'cancel_func' and 'cancel_baton' parameters.

* subversion/libsvn_wc/externals.c
  (close_file): Track the change.

* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): Track the change.

* subversion/libsvn_wc/update_editor.c
  (close_directory, close_file): Track the change.

Modified:
    subversion/trunk/subversion/libsvn_wc/externals.c
    subversion/trunk/subversion/libsvn_wc/merge.c
    subversion/trunk/subversion/libsvn_wc/props.c
    subversion/trunk/subversion/libsvn_wc/props.h
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1417932&r1=1417931&r2=1417932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Thu Dec  6 15:11:07 2012
@@ -743,7 +743,6 @@ close_file(void *file_baton,
                                       actual_props,
                                       regular_prop_changes,
                                       FALSE /* dry_run */,
-                                      eb->cancel_func, eb->cancel_baton,
                                       pool, pool));
         }
       else

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1417932&r1=1417931&r2=1417932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Dec  6 15:11:07 2012
@@ -1254,7 +1254,6 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
                                   original_props, pristine_props, actual_props,
                                   prop_diff,
                                   dry_run,
-                                  cancel_func, cancel_baton,
                                   scratch_pool, scratch_pool));
     }
 

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417932&r1=1417931&r2=1417932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec  6 15:11:07 2012
@@ -301,7 +301,6 @@ svn_wc__perform_props_merge(svn_wc_notif
                               pristine_props,
                               actual_props,
                               propchanges, dry_run,
-                              cancel_func, cancel_baton,
                               scratch_pool, scratch_pool));
 
   if (dry_run)
@@ -1187,8 +1186,6 @@ svn_wc__merge_props(svn_skel_t **conflic
                     apr_hash_t *actual_props,
                     const apr_array_header_t *propchanges,
                     svn_boolean_t dry_run,
-                    svn_cancel_func_t cancel_func,
-                    void *cancel_baton,
                     apr_pool_t *result_pool,
                     apr_pool_t *scratch_pool)
 {
@@ -1236,10 +1233,6 @@ svn_wc__merge_props(svn_skel_t **conflic
 
       svn_pool_clear(iterpool);
 
-      /* Should we stop the prop merging process?  */
-      if (cancel_func)
-        SVN_ERR(cancel_func(cancel_baton));
-
       /* For the incoming propchange, figure out the TO and FROM values. */
       incoming_change = &APR_ARRAY_IDX(propchanges, i, svn_prop_t);
       propname = incoming_change->name;

Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1417932&r1=1417931&r2=1417932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Thu Dec  6 15:11:07 2012
@@ -104,8 +104,6 @@ svn_wc__merge_props(svn_skel_t **conflic
                     apr_hash_t *actual_props,
                     const apr_array_header_t *propchanges,
                     svn_boolean_t dry_run,
-                    svn_cancel_func_t cancel_func,
-                    void *cancel_baton,
                     apr_pool_t *result_pool,
                     apr_pool_t *scratch_pool);
 

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1417932&r1=1417931&r2=1417932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Dec  6 15:11:07 2012
@@ -2494,8 +2494,6 @@ close_directory(void *dir_baton,
                                     actual_props,
                                     regular_prop_changes,
                                     FALSE /* dry_run */,
-                                    eb->cancel_func,
-                                    eb->cancel_baton,
                                     db->pool,
                                     scratch_pool),
                 _("Couldn't do property merge"));
@@ -4107,7 +4105,6 @@ close_file(void *file_baton,
                                   current_actual_props,
                                   regular_prop_changes, /* propchanges */
                                   FALSE /* dry_run */,
-                                  eb->cancel_func, eb->cancel_baton,
                                   scratch_pool,
                                   scratch_pool));
       /* We will ALWAYS have properties to save (after a not-dry-run merge). */
@@ -4240,7 +4237,6 @@ close_file(void *file_baton,
                                   fake_actual_props /* actual_props */,
                                   regular_prop_changes, /* propchanges */
                                   FALSE /* dry_run */,
-                                  eb->cancel_func, eb->cancel_baton,
                                   scratch_pool,
                                   scratch_pool));
 



Mime
View raw message