subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1080559 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/commit.c libsvn_wc/adm_ops.c libsvn_wc/deprecated.c
Date Fri, 11 Mar 2011 12:54:17 GMT
Author: julianfoad
Date: Fri Mar 11 12:54:17 2011
New Revision: 1080559

URL: http://svn.apache.org/viewvc?rev=1080559&view=rev
Log:
Add a WC context parameter to svn_wc_queue_committed3(), for consistency
with all other public WC APIs that take the abspath of a WC node.  In my
opinion this context parameter may well be needed if we change the
implementation, even though it is not currently used.

* subversion/include/svn_wc.h,
  subversion/libsvn_wc/adm_ops.c
  (svn_wc_queue_committed3): Add a 'wc_ctx' parameter.

* subversion/libsvn_client/commit.c
  (post_process_commit_item): Pass 'wc_ctx' to svn_wc_queue_committed3().

* subversion/libsvn_wc/deprecated.c
  (svn_wc_queue_committed2): Generate and pass a temporary 'wc_ctx' to
    svn_wc_queue_committed3().

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_client/commit.c
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/deprecated.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1080559&r1=1080558&r2=1080559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri Mar 11 12:54:17 2011
@@ -4785,6 +4785,7 @@ svn_wc_committed_queue_create(apr_pool_t
  */
 svn_error_t *
 svn_wc_queue_committed3(svn_wc_committed_queue_t *queue,
+                        svn_wc_context_t *wc_ctx,
                         const char *local_abspath,
                         svn_boolean_t recurse,
                         const apr_array_header_t *wcprop_changes,

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1080559&r1=1080558&r2=1080559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar 11 12:54:17 2011
@@ -936,7 +936,7 @@ post_process_commit_item(svn_wc_committe
   remove_lock = (! keep_locks && (item->state_flags
                                        & SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN));
 
-  return svn_wc_queue_committed3(queue, item->path,
+  return svn_wc_queue_committed3(queue, wc_ctx, item->path,
                                  loop_recurse, item->incoming_prop_changes,
                                  remove_lock, !keep_changelists,
                                  md5_checksum, sha1_checksum, scratch_pool);

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1080559&r1=1080558&r2=1080559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Mar 11 12:54:17 2011
@@ -391,6 +391,7 @@ svn_wc_committed_queue_create(apr_pool_t
 
 svn_error_t *
 svn_wc_queue_committed3(svn_wc_committed_queue_t *queue,
+                        svn_wc_context_t *wc_ctx,
                         const char *local_abspath,
                         svn_boolean_t recurse,
                         const apr_array_header_t *wcprop_changes,

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1080559&r1=1080558&r2=1080559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Mar 11 12:54:17 2011
@@ -573,12 +573,18 @@ svn_wc_queue_committed2(svn_wc_committed
                         const svn_checksum_t *md5_checksum,
                         apr_pool_t *scratch_pool)
 {
+  svn_wc_context_t *wc_ctx;
   const char *local_abspath;
 
+  SVN_ERR(svn_wc_context_create(&wc_ctx, NULL, scratch_pool, scratch_pool));
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool));
-  return svn_wc_queue_committed3(queue, local_abspath, recurse, wcprop_changes,
-                                 remove_lock, remove_changelist, md5_checksum,
-                                 NULL /* sha1_checksum */, scratch_pool);
+
+  SVN_ERR(svn_wc_queue_committed3(queue, wc_ctx, local_abspath, recurse,
+                                  wcprop_changes,
+                                  remove_lock, remove_changelist, md5_checksum,
+                                  NULL /* sha1_checksum */, scratch_pool));
+
+  return svn_error_return(svn_wc_context_destroy(wc_ctx));
 }
 
 svn_error_t *



Mime
View raw message