You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/09/10 16:58:13 UTC
svn commit: r995816 - in /subversion/trunk/subversion/libsvn_wc:
deprecated.c entries.c
Author: rhuijben
Date: Fri Sep 10 14:58:12 2010
New Revision: 995816
URL: http://svn.apache.org/viewvc?rev=995816&view=rev
Log:
Following up on r995775, remove now unused temporary api.
* subversion/libsvn_wc/deprecated.c
(svn_wc_mark_missing_deleted): Remove multi-db code.
* subversion/libsvn_wc/entries.c
(svn_wc__temp_mark_missing_not_present): Remove function.
Modified:
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/entries.c
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=995816&r1=995815&r2=995816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Sep 10 14:58:12 2010
@@ -2047,27 +2047,11 @@ svn_wc_mark_missing_deleted(const char *
svn_wc_adm_access_t *parent,
apr_pool_t *pool)
{
-#ifdef SINGLE_DB
/* With a single DB a node will never be missing */
return svn_error_createf(SVN_ERR_WC_PATH_FOUND, NULL,
_("Unexpectedly found '%s': "
"path is marked 'missing'"),
svn_dirent_local_style(path, pool));
-#else
- const char *local_abspath;
- svn_wc_context_t *wc_ctx;
-
- SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL,
- svn_wc__adm_get_db(parent), pool));
-
- SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
-
- SVN_ERR(svn_wc__temp_mark_missing_not_present(local_abspath, wc_ctx, pool));
-
- SVN_ERR(svn_wc_context_destroy(wc_ctx));
-
- return SVN_NO_ERROR;
-#endif
}
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=995816&r1=995815&r2=995816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Fri Sep 10 14:58:12 2010
@@ -2822,54 +2822,3 @@ svn_wc_walk_entries3(const char *path,
svn_dirent_local_style(local_abspath, pool)),
walk_baton, pool);
}
-
-#ifndef SVN_WC__SINGLE_DB
-svn_error_t *
-svn_wc__temp_mark_missing_not_present(const char *local_abspath,
- svn_wc_context_t *wc_ctx,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
- const char *repos_relpath, *repos_root_url, *repos_uuid;
- svn_revnum_t revision;
-
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
- SVN_ERR(svn_wc__db_read_info(&status, &kind, &revision, &repos_relpath,
- &repos_root_url, &repos_uuid, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
- wc_ctx->db, local_abspath,
- scratch_pool, scratch_pool));
- if (kind == svn_wc__db_kind_dir
- && status == svn_wc__db_status_obstructed_delete)
- {
- if (!repos_relpath)
- SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url,
- &repos_uuid,
- wc_ctx->db, local_abspath,
- scratch_pool, scratch_pool));
-
- SVN_ERR(svn_wc__db_temp_op_remove_entry(wc_ctx->db, local_abspath,
- scratch_pool));
-
- if (!SVN_IS_VALID_REVNUM(revision))
- revision = 0; /* Just make one up */
-
- SVN_ERR(svn_wc__db_base_add_absent_node(wc_ctx->db, local_abspath,
- repos_relpath, repos_root_url,
- repos_uuid, revision,
- svn_wc__db_kind_dir,
- svn_wc__db_status_not_present,
- NULL, NULL, scratch_pool));
-
- return SVN_NO_ERROR;
- }
-
- return svn_error_createf(SVN_ERR_WC_PATH_FOUND, NULL,
- _("Unexpectedly found '%s': "
- "path is marked 'missing'"),
- svn_dirent_local_style(local_abspath, scratch_pool));
-}
-#endif