Author: gstein
Date: Thu Apr 8 17:48:38 2010
New Revision: 932028
URL: http://svn.apache.org/viewvc?rev=932028&view=rev
Log:
Now that libsvn_client does not use svn_wc_adm_access_t (YAY!), we can
completely deprecate the entire API.
Also ensured that all functions using the type are properly deprecated.
* subversion/include/svn_wc.h:
(svn_wc_adm_retrieve, svn_wc_adm_probe_retrieve, svn_wc_adm_close2,
svn_wc_adm_access_path, svn_wc_adm_access_pool): deprecate
(svn_wc_crawl_revisions4): fixed style of deprecation
(svn_wc_crawl_revisions3): add missing deprecation
(svn_wc_transmit_text_deltas3): add missing deprecation
* subversion/libsvn_wc/lock.c:
(...): add comments to some functions, noting they are deprecated. these
are not moved to deprecated.c, which is really reserved for just
wrappers around newer functions. we don't want to place "bulk" logic
into that file.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_wc/lock.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=932028&r1=932027&r2=932028&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Apr 8 17:48:38 2010
@@ -415,6 +415,7 @@ svn_wc_adm_open_anchor(svn_wc_adm_access
*
* @a pool is used only for local processing, it is not used for the batons.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_adm_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
@@ -428,6 +429,7 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
* svn_wc_adm_retrieve() with @a path replaced by the parent directory of
* @a path.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_adm_probe_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
@@ -512,6 +514,7 @@ svn_wc_adm_probe_try(svn_wc_adm_access_t
*
* @since New in 1.6
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_adm_close2(svn_wc_adm_access_t *adm_access,
apr_pool_t *scratch_pool);
@@ -527,10 +530,12 @@ svn_error_t *
svn_wc_adm_close(svn_wc_adm_access_t *adm_access);
/** Return the path used to open the access baton @a adm_access */
+SVN_DEPRECATED
const char *
svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access);
/** Return the pool used by access baton @a adm_access */
+SVN_DEPRECATED
apr_pool_t *
svn_wc_adm_access_pool(const svn_wc_adm_access_t *adm_access);
@@ -5036,7 +5041,8 @@ svn_wc_crawl_revisions5(svn_wc_context_t
* @since New in 1.6.
* @deprecated Provided for compatibility with the 1.6 API.
*/
-SVN_DEPRECATED svn_error_t *
+SVN_DEPRECATED
+svn_error_t *
svn_wc_crawl_revisions4(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_ra_reporter3_t *reporter,
@@ -5058,6 +5064,7 @@ svn_wc_crawl_revisions4(const char *path
*
* @deprecated Provided for compatibility with the 1.5 API.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_crawl_revisions3(const char *path,
svn_wc_adm_access_t *adm_access,
@@ -6966,6 +6973,7 @@ svn_wc_transmit_text_deltas3(const char
* @since New in 1.4.
* @deprecated Provided for backwards compatibility with the 1.6 API.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_transmit_text_deltas2(const char **tempfile,
unsigned char digest[],
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=932028&r1=932027&r2=932028&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Thu Apr 8 17:48:38 2010
@@ -859,6 +859,7 @@ svn_wc__adm_retrieve_internal2(svn_wc__d
}
+/* SVN_DEPRECATED */
svn_error_t *
svn_wc_adm_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
@@ -946,6 +947,7 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
}
+/* SVN_DEPRECATED */
svn_error_t *
svn_wc_adm_probe_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
@@ -988,6 +990,8 @@ svn_wc_adm_probe_retrieve(svn_wc_adm_acc
return SVN_NO_ERROR;
}
+
+/* SVN_DEPRECATED */
svn_error_t *
svn_wc_adm_probe_try3(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
@@ -1409,12 +1413,16 @@ do_close(svn_wc_adm_access_t *adm_access
scratch_pool));
}
+
+/* SVN_DEPRECATED */
svn_error_t *
svn_wc_adm_close2(svn_wc_adm_access_t *adm_access, apr_pool_t *scratch_pool)
{
return svn_error_return(do_close(adm_access, FALSE, scratch_pool));
}
+
+/* SVN_DEPRECATED */
svn_boolean_t
svn_wc_adm_locked(const svn_wc_adm_access_t *adm_access)
{
@@ -1472,6 +1480,7 @@ svn_wc_locked2(svn_boolean_t *locked_her
}
+/* SVN_DEPRECATED */
const char *
svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access)
{
@@ -1486,6 +1495,7 @@ svn_wc__adm_access_abspath(const svn_wc_
}
+/* SVN_DEPRECATED */
apr_pool_t *
svn_wc_adm_access_pool(const svn_wc_adm_access_t *adm_access)
{
