svn commit: r1661511 - /subversion/trunk/subversion/libsvn_client/copy.c

[rhuijben]

Author: rhuijben
Date: Sun Feb 22 18:43:59 2015
New Revision: 1661511

URL: http://svn.apache.org/r1661511
Log:
Following up on r1661451, properly pass the metadata_only argument doen the
call chain.

* subversion/libsvn_client/copy.c
  (do_wc_to_wc_copies_with_write_lock,
   do_wc_to_wc_copies,
   try_copy): Pass metadata_only through to libsvn_wc instead of only
     a few levels inwards.

Found by: philip

Modified:
    subversion/trunk/subversion/libsvn_client/copy.c

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1661511&r1=1661510&r2=1661511&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Sun Feb 22 18:43:59 2015
@@ -655,6 +655,7 @@ static svn_error_t *
 do_wc_to_wc_copies_with_write_lock(svn_boolean_t *timestamp_sleep,
                                    const apr_array_header_t *copy_pairs,
                                    const char *dst_parent,
+                                   svn_boolean_t metadata_only,
                                    svn_boolean_t pin_externals,
                                    const apr_hash_t *externals_to_pin,
                                    svn_client_ctx_t *ctx,
@@ -696,7 +697,7 @@ do_wc_to_wc_copies_with_write_lock(svn_b
                                     iterpool);
       *timestamp_sleep = TRUE;
       err = svn_wc_copy3(ctx->wc_ctx, pair->src_abspath_or_url, dst_abspath,
-                         FALSE /* metadata_only */,
+                         metadata_only,
                          ctx->cancel_func, ctx->cancel_baton,
                          ctx->notify_func2, ctx->notify_baton2, iterpool);
       if (err)
@@ -738,6 +739,7 @@ do_wc_to_wc_copies_with_write_lock(svn_b
 static svn_error_t *
 do_wc_to_wc_copies(svn_boolean_t *timestamp_sleep,
                    const apr_array_header_t *copy_pairs,
+                   svn_boolean_t metadata_only,
                    svn_boolean_t pin_externals,
                    const apr_hash_t *externals_to_pin,
                    svn_client_ctx_t *ctx,
@@ -753,8 +755,8 @@ do_wc_to_wc_copies(svn_boolean_t *timest
 
   SVN_WC__CALL_WITH_WRITE_LOCK(
     do_wc_to_wc_copies_with_write_lock(timestamp_sleep, copy_pairs, dst_parent,
-                                       pin_externals, externals_to_pin,
-                                       ctx, pool),
+                                       metadata_only, pin_externals,
+                                       externals_to_pin, ctx, pool),
     ctx->wc_ctx, dst_parent_abspath, FALSE, pool);
 
   return SVN_NO_ERROR;
@@ -3053,9 +3055,10 @@ try_copy(svn_boolean_t *timestamp_sleep,
       else
         {
           /* We ignore these values, so assert the default value */
-          SVN_ERR_ASSERT(allow_mixed_revisions && !metadata_only);
+          SVN_ERR_ASSERT(allow_mixed_revisions);
           return svn_error_trace(do_wc_to_wc_copies(timestamp_sleep,
                                                     copy_pairs,
+                                                    metadata_only,
                                                     pin_externals,
                                                     externals_to_pin,
                                                     ctx, pool));