You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/19 17:33:50 UTC
svn commit: r935625 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_wc/lock.c
Author: gstein
Date: Mon Apr 19 15:33:49 2010
New Revision: 935625
URL: http://svn.apache.org/viewvc?rev=935625&view=rev
Log:
Remove some private APIs that libsvn_client no longer requires.
* subversion/include/private/svn_wc_private.h:
* subversion/libsvn_wc/lock.c:
(svn_wc__adm_open_in_context, svn_wc__adm_probe_in_context,
svn_wc__adm_retrieve_from_content): removed
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_wc/lock.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=935625&r1=935624&r2=935625&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Mon Apr 19 15:33:49 2010
@@ -214,40 +214,7 @@ svn_wc__strictly_is_wc_root(svn_boolean_
const char *local_abspath,
apr_pool_t *scratch_pool);
-/** Like svn_wc_adm_open3() but with a svn_wc_ctx_t* instead of an associated
- * baton.
- *
- * ### BH: This function is not for public consumption. New code should either
- * use the deprecated access battons or the new wc contexts but not
- * both. Too bad the WC-NG conversion is not done yet.
- */
-svn_error_t *
-svn_wc__adm_open_in_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *path,
- svn_boolean_t write_lock,
- int levels_to_lock,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool);
-
-/** Like svn_wc_adm_probe_open3(), but with a svn_wc_context_t * instead of
- * an associated baton.
- *
- * ### See usage note to svn_wc__adm_open_in_context(), above.
- */
-svn_error_t *
-svn_wc__adm_probe_in_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *path,
- svn_boolean_t write_lock,
- int levels_to_lock,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool);
-
-
/**
* The following are temporary APIs to aid in the transition from wc-1 to
* wc-ng. Use them for new development now, but they may be disappearing
@@ -259,17 +226,6 @@ typedef svn_error_t *(*svn_wc__node_foun
void *walk_baton,
apr_pool_t *scratch_pool);
-/**
- * Retrieve an @a adm_access for @a path from the @a wc_ctx.
- * If the @a adm_access for @a local_abspath is not found, this
- * function sets @a *adm_acess to NULL and does not return an error.
- */
-svn_error_t *
-svn_wc__adm_retrieve_from_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *pool);
-
/*
* Convert from svn_wc_conflict_description2_t to svn_wc_conflict_description_t.
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=935625&r1=935624&r2=935625&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Mon Apr 19 15:33:49 2010
@@ -1343,21 +1343,6 @@ svn_wc_adm_open_anchor(svn_wc_adm_access
}
-svn_error_t *
-svn_wc__adm_retrieve_from_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *pool)
-{
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
-
- *adm_access = svn_wc__adm_retrieve_internal2(wc_ctx->db,
- local_abspath,
- pool);
-
- return SVN_NO_ERROR;
-}
-
/* Does the work of closing the access baton ADM_ACCESS. Any physical
locks are removed from the working copy if PRESERVE_LOCK is FALSE, or
are left if PRESERVE_LOCK is TRUE. Any associated access batons that
@@ -1561,84 +1546,6 @@ svn_wc__adm_missing(svn_wc__db_t *db,
return (kind == svn_wc__db_kind_dir) && !available && obstructed;
}
-svn_error_t *
-svn_wc__adm_open_in_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *path,
- svn_boolean_t write_lock,
- int levels_to_lock,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool)
-{
- SVN_ERR_ASSERT(wc_ctx != NULL);
-
- SVN_ERR(open_all(adm_access, path, wc_ctx->db, TRUE, write_lock,
- levels_to_lock, cancel_func, cancel_baton, pool));
-
- return SVN_NO_ERROR;
-}
-
-/* The following is largely cribbed from svn_wc_adm_probe_open3(). */
-svn_error_t *
-svn_wc__adm_probe_in_context(svn_wc_adm_access_t **adm_access,
- svn_wc_context_t *wc_ctx,
- const char *path,
- svn_boolean_t write_lock,
- int levels_to_lock,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool)
-{
- const char *dir;
- svn_error_t *err;
-
- SVN_ERR_ASSERT(wc_ctx != NULL);
-
- SVN_ERR(probe(wc_ctx->db, &dir, path, pool));
-
- /* If we moved up a directory, then the path is not a directory, or it
- is not under version control. In either case, the notion of
- levels_to_lock does not apply to the provided path. Disable it so
- that we don't end up trying to lock more than we need. */
- if (dir != path)
- levels_to_lock = 0;
-
- err = svn_wc__adm_open_in_context(adm_access, wc_ctx, dir, write_lock,
- levels_to_lock, cancel_func, cancel_baton,
- pool);
-
- if (err)
- {
- svn_error_t *err2;
-
- /* If we got an error on the parent dir, that means we failed to
- get an access baton for the child in the first place. And if
- the reason we couldn't get the child access baton is that the
- child is not a versioned directory, then return an error
- about the child, not the parent. */
- svn_node_kind_t child_kind;
- if ((err2 = svn_io_check_path(path, &child_kind, pool)))
- {
- svn_error_compose(err, err2);
- return err;
- }
-
- if ((dir != path)
- && (child_kind == svn_node_dir)
- && (err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY))
- {
- svn_error_clear(err);
- return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL,
- _("'%s' is not a working copy"),
- svn_dirent_local_style(path, pool));
- }
-
- return err;
- }
-
- return SVN_NO_ERROR;
-}
svn_error_t *
svn_wc__temp_get_relpath(const char **rel_path,