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/09/10 14:44:10 UTC
svn commit: r995775 - in /subversion/trunk/subversion/libsvn_client:
commit.c commit_util.c merge.c
Author: philip
Date: Fri Sep 10 12:44:10 2010
New Revision: 995775
URL: http://svn.apache.org/viewvc?rev=995775&view=rev
Log:
Remove obsolete multi-db code.
* subversion/libsvn_client/commit.c
(post_process_commit_item): Remove conditional multi-db code.
* subversion/libsvn_client/commit_util.c
(harvest_committables): Remove conditional multi-db code.
* subversion/libsvn_client/merge.c
(obstructed_or_missing,
get_mergeinfo_walk_cb): Remove conditional multi-db code.
Modified:
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=995775&r1=995774&r2=995775&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Sep 10 12:44:10 2010
@@ -929,25 +929,6 @@ post_process_commit_item(svn_wc_committe
svn_boolean_t loop_recurse = FALSE;
svn_boolean_t remove_lock;
-#ifndef SVN_WC__SINGLE_DB
- /* Is it a missing, deleted directory?
-
- ### Temporary: once we centralise this sort of node is just a
- normal delete and will get handled by the post-commit queue. */
- if (item->kind == svn_node_dir
- && item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
- {
- svn_boolean_t obstructed;
-
- SVN_ERR(svn_wc__node_is_status_obstructed(&obstructed,
- wc_ctx, item->path,
- scratch_pool));
- if (obstructed)
- return svn_wc__temp_mark_missing_not_present(item->path,
- wc_ctx, scratch_pool);
- }
-#endif
-
if ((item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
&& (item->kind == svn_node_dir)
&& (item->copyfrom_url))
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=995775&r1=995774&r2=995775&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Sep 10 12:44:10 2010
@@ -859,46 +859,6 @@ harvest_committables(apr_hash_t *committ
and depth says not to go there. */
continue;
}
-#ifndef SVN_WC__SINGLE_DB
- else
- {
- svn_boolean_t obstructed;
-
- SVN_ERR(svn_wc__node_is_status_obstructed(&obstructed,
- ctx->wc_ctx,
- this_abspath,
- iterpool));
-
- if (obstructed)
- {
- /* A missing, schedule-delete child dir is
- allowable. Just don't try to recurse. */
- svn_node_kind_t childkind;
- SVN_ERR(svn_io_check_path(this_abspath,
- &childkind,
- iterpool));
- if (childkind == svn_node_none && this_is_deleted)
- {
- if (svn_wc__changelist_match(ctx->wc_ctx,
- this_abspath,
- changelists,
- iterpool))
- {
- SVN_ERR(add_committable(
- committables, this_abspath,
- this_kind,
- repos_root_url, this_repos_relpath,
- SVN_INVALID_REVNUM,
- NULL,
- SVN_INVALID_REVNUM,
- SVN_CLIENT_COMMIT_ITEM_DELETE,
- result_pool, iterpool));
- continue; /* don't recurse! */
- }
- }
- }
- }
-#endif
}
{
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=995775&r1=995774&r2=995775&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Sep 10 12:44:10 2010
@@ -437,29 +437,7 @@ obstructed_or_missing(svn_wc_notify_stat
local_abspath,
pool));
if (is_deleted)
- {
-#ifndef SVN_WC__SINGLE_DB
- /* ### While we are not at single-db: detect missing .svn dirs.
- ### Once we switch to single db expected kind should be always
- ### none, just like for files */
- if (kind_expected == svn_node_dir)
- {
- if (kind_on_disk == svn_node_none)
- {
- svn_boolean_t is_obstructed;
-
- SVN_ERR(svn_wc__node_is_status_obstructed(&is_obstructed,
- merge_b->ctx->wc_ctx,
- local_abspath,
- pool));
- if (!is_obstructed)
- kind_expected = svn_node_none;
- }
- }
- else
-#endif
- kind_expected = svn_node_none;
- }
+ kind_expected = svn_node_none;
}
if (kind_expected == kind_on_disk)
@@ -5467,9 +5445,6 @@ get_mergeinfo_walk_cb(const char *local_
svn_boolean_t is_present;
svn_boolean_t deleted;
svn_boolean_t absent;
-#ifndef SVN_WC__SINGLE_DB
- svn_boolean_t obstructed;
-#endif
svn_boolean_t immediate_child_dir;
/* TODO(#2843) How to deal with a excluded item on merge? */
@@ -5481,20 +5456,12 @@ get_mergeinfo_walk_cb(const char *local_
if (!is_present)
return SVN_NO_ERROR;
-#ifndef SVN_WC__SINGLE_DB
- SVN_ERR(svn_wc__node_is_status_obstructed(&obstructed, wb->ctx->wc_ctx,
- local_abspath, scratch_pool));
-#endif
SVN_ERR(svn_wc__node_is_status_deleted(&deleted, wb->ctx->wc_ctx,
local_abspath, scratch_pool));
SVN_ERR(svn_wc__node_is_status_absent(&absent, wb->ctx->wc_ctx,
local_abspath, scratch_pool));
-#ifndef SVN_WC__SINGLE_DB
- if (obstructed || deleted || absent)
-#else
if (deleted || absent)
-#endif
{
propval = NULL;
switched = FALSE;
@@ -5525,11 +5492,7 @@ get_mergeinfo_walk_cb(const char *local_
&& (strcmp(abs_parent_path,
wb->merge_target_abspath) == 0));
/* Make sure what the WC thinks is present on disk really is. */
-#ifndef SVN_WC__SINGLE_DB
- if (!absent && !deleted && !obstructed)
-#else
if (!absent && !deleted)
-#endif
SVN_ERR(record_missing_subtree_roots(local_abspath, kind,
wb->subtree_dirents,
wb->missing_subtrees,