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 2011/04/11 22:59:46 UTC
svn commit: r1091207 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
wc_db.c
Author: rhuijben
Date: Mon Apr 11 20:59:45 2011
New Revision: 1091207
URL: http://svn.apache.org/viewvc?rev=1091207&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(svn_wc_delete4): Remove some obsolete code for a case that is already
handled in wc_db.c
* subversion/libsvn_wc/wc_db.c
(db_working_actual_remove): Disable some slow tests in !maintainer mode.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1091207&r1=1091206&r2=1091207&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 11 20:59:45 2011
@@ -586,16 +586,14 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
apr_pool_t *pool)
{
svn_wc__db_t *db = wc_ctx->db;
- svn_boolean_t was_add = FALSE;
svn_error_t *err;
svn_wc__db_status_t status;
svn_wc__db_kind_t kind;
- svn_boolean_t have_base;
err = svn_wc__db_read_info(&status, &kind, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- &have_base, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath, pool, pool);
if (delete_unversioned_target &&
@@ -626,28 +624,6 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
break;
}
- if (status == svn_wc__db_status_added)
- {
- const char *op_root_abspath;
- SVN_ERR(svn_wc__db_scan_addition(&status, &op_root_abspath, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- db, local_abspath, pool, pool));
-
- if (!have_base)
- was_add = strcmp(op_root_abspath, local_abspath) == 0;
- else
- {
- svn_wc__db_status_t base_status;
- SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- db, local_abspath, pool, pool));
-
- if (base_status == svn_wc__db_status_not_present)
- was_add = TRUE;
- }
- }
-
if (kind == svn_wc__db_kind_dir)
{
/* ### NODE_DATA We recurse into the subtree here, which is fine,
@@ -705,20 +681,6 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
svn_wc_create_notify(local_abspath, svn_wc_notify_delete,
pool), pool);
- if (kind == svn_wc__db_kind_dir && was_add)
- {
- /* We have to release the WC-DB handles, to allow removing
- the directory on windows.
-
- A better solution would probably be to call svn_wc__adm_destroy()
- in the right place, but we can't do that without breaking the API. */
-
- SVN_ERR(svn_wc__db_temp_forget_directory(
- wc_ctx->db,
- local_abspath,
- pool));
- }
-
/* By the time we get here, anything that was scheduled to be added has
become unversioned */
if (!keep_local)
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1091207&r1=1091206&r2=1091207&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Apr 11 20:59:45 2011
@@ -4590,6 +4590,7 @@ db_working_actual_remove(svn_wc__db_wcro
SVN_ERR(remove_children(wcroot, local_relpath, svn_wc__db_status_incomplete,
op_depth, scratch_pool));
+#ifdef SVN_DEBUG
/* Postcondition: There are no NODES rows in this subtree, at same or
greater op_depth. */
{
@@ -4620,6 +4621,7 @@ db_working_actual_remove(svn_wc__db_wcro
SVN_ERR_ASSERT(! have_row);
SVN_ERR(svn_sqlite__reset(stmt));
}
+#endif
return SVN_NO_ERROR;
}