You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/09 17:08:44 UTC
svn commit: r920948 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_wc/adm_ops.c libsvn_wc/deprecated.c
Author: philip
Date: Tue Mar 9 16:08:44 2010
New Revision: 920948
URL: http://svn.apache.org/viewvc?rev=920948&view=rev
Log:
* subversion/include/svn_wc.h
(svn_wc_queue_committed2): Mark SVN_DEPRECATE.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_queue_committed2, svn_wc_process_committed_queue): Delete, moved
to deprecated.c.
* subversion/libsvn_wc/deprecated.c
(svn_wc_queue_committed2, svn_wc_process_committed_queue): Add, moved
from adm_ops.c.
Modified:
subversion/trunk/subversion/include/svn_wc.h
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=920948&r1=920947&r2=920948&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Mar 9 16:08:44 2010
@@ -4783,6 +4783,7 @@ svn_wc_queue_committed3(svn_wc_committed
*
* @deprecated Provided for backwards compatibility with the 1.6 API.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_queue_committed2(svn_wc_committed_queue_t *queue,
const char *path,
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=920948&r1=920947&r2=920948&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Mar 9 16:08:44 2010
@@ -645,23 +645,6 @@ svn_wc_queue_committed3(svn_wc_committed
return SVN_NO_ERROR;
}
-svn_error_t *
-svn_wc_queue_committed2(svn_wc_committed_queue_t *queue,
- const char *path,
- svn_wc_adm_access_t *adm_access,
- svn_boolean_t recurse,
- const apr_array_header_t *wcprop_changes,
- svn_boolean_t remove_lock,
- svn_boolean_t remove_changelist,
- const svn_checksum_t *checksum,
- apr_pool_t *scratch_pool)
-{
- return svn_wc_queue_committed3(queue, path, recurse, wcprop_changes,
- remove_lock, remove_changelist, checksum,
- scratch_pool);
-}
-
-
/* NOTE: this function doesn't move to deprecated.c because of its need
for the internals of svn_wc_committed_queue_t. */
svn_error_t *
@@ -773,24 +756,6 @@ svn_wc_process_committed_queue2(svn_wc_c
}
svn_error_t *
-svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue,
- svn_wc_adm_access_t *adm_access,
- svn_revnum_t new_revnum,
- const char *rev_date,
- const char *rev_author,
- apr_pool_t *pool)
-{
- svn_wc_context_t *wc_ctx;
-
- SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL,
- svn_wc__adm_get_db(adm_access),
- pool));
- SVN_ERR(svn_wc_process_committed_queue2(queue, wc_ctx, new_revnum,
- rev_date, rev_author, pool));
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
svn_wc_process_committed4(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=920948&r1=920947&r2=920948&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Mar 9 16:08:44 2010
@@ -3643,3 +3643,39 @@ svn_wc_crop_tree(svn_wc_adm_access_t *an
return svn_error_return(svn_wc_context_destroy(wc_ctx));
}
+
+svn_error_t *
+svn_wc_queue_committed2(svn_wc_committed_queue_t *queue,
+ const char *path,
+ svn_wc_adm_access_t *adm_access,
+ svn_boolean_t recurse,
+ const apr_array_header_t *wcprop_changes,
+ svn_boolean_t remove_lock,
+ svn_boolean_t remove_changelist,
+ const svn_checksum_t *checksum,
+ apr_pool_t *scratch_pool)
+{
+ return svn_wc_queue_committed3(queue, path, recurse, wcprop_changes,
+ remove_lock, remove_changelist, checksum,
+ scratch_pool);
+}
+
+
+svn_error_t *
+svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue,
+ svn_wc_adm_access_t *adm_access,
+ svn_revnum_t new_revnum,
+ const char *rev_date,
+ const char *rev_author,
+ apr_pool_t *pool)
+{
+ svn_wc_context_t *wc_ctx;
+
+ SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL,
+ svn_wc__adm_get_db(adm_access),
+ pool));
+ SVN_ERR(svn_wc_process_committed_queue2(queue, wc_ctx, new_revnum,
+ rev_date, rev_author, pool));
+ return SVN_NO_ERROR;
+}
+