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/20 03:42:48 UTC
svn commit: r935788 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/commit_util.c
libsvn_client/merge.c libsvn_client/mergeinfo.c
libsvn_client/prop_commands.c libsvn_wc/node.c
Author: gstein
Date: Tue Apr 20 01:42:48 2010
New Revision: 935788
URL: http://svn.apache.org/viewvc?rev=935788&view=rev
Log:
Rename svn_wc__node_is_status_added to svn_wc__node_is_added to indicate
this is wholly unrelated to the schedule_add, and is a more general
statement of the node's condition.
* subversion/include/private/svn_wc_private.h:
(svn_wc__node_is_status_added): rename to ...
(svn_wc__node_is_added): ... this. document more details.
* subversion/libsvn_client/commit_util.c:
(svn_client__harvest_committables): track rename
* subversion/libsvn_client/merge.c:
(filter_self_referential_mergeinfo): track rename
* subversion/libsvn_client/mergeinfo.c:
(svn_client__get_wc_or_repos_mergeinfo): track rename
* subversion/libsvn_client/prop_commands.c:
(svn_client_propget3): track rename
* subversion/libsvn_wc/node.c:
(svn_wc__node_is_status_added): renamed to ...
(svn_wc__node_is_added): ... this. also look for obstructed_add
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/prop_commands.c
subversion/trunk/subversion/libsvn_wc/node.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=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Apr 20 01:42:48 2010
@@ -428,12 +428,18 @@ svn_wc__node_is_status_present(svn_boole
* @a wc_ctx. If @a local_abspath is not in the working copy, return
* @c SVN_ERR_WC_PATH_NOT_FOUND. Use @a scratch_pool for all temporary
* allocations.
+ *
+ * NOTE: "added" in this sense, means it was added, copied-here, or
+ * moved-here. This function provides NO information on whether this
+ * addition has replaced another node.
+ *
+ * To be clear, this does NOT correspond to svn_wc_schedule_add.
*/
svn_error_t *
-svn_wc__node_is_status_added(svn_boolean_t *is_added,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
+svn_wc__node_is_added(svn_boolean_t *is_added,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
/**
* Get the base revision of @a local_abspath using @a wc_ctx. If
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Tue Apr 20 01:42:48 2010
@@ -1023,8 +1023,8 @@ svn_client__harvest_committables(apr_has
iterpool);
svn_boolean_t is_added;
- err = svn_wc__node_is_status_added(&is_added, ctx->wc_ctx,
- parent_abspath, iterpool);
+ err = svn_wc__node_is_added(&is_added, ctx->wc_ctx, parent_abspath,
+ iterpool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
svn_error_clear(err);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Apr 20 01:42:48 2010
@@ -838,8 +838,7 @@ filter_self_referential_mergeinfo(apr_ar
/* If this is a merge from the same repository and PATH itself has been
added there is no need to filter. */
- SVN_ERR(svn_wc__node_is_status_added(&is_added, ctx->wc_ctx,
- local_abspath, pool));
+ SVN_ERR(svn_wc__node_is_added(&is_added, ctx->wc_ctx, local_abspath, pool));
if (is_added)
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue Apr 20 01:42:48 2010
@@ -560,8 +560,8 @@ svn_client__get_wc_or_repos_mergeinfo_ca
SVN_ERR(svn_dirent_get_absolute(&local_abspath, target_wcpath,
scratch_pool));
- SVN_ERR(svn_wc__node_is_status_added(&is_added, ctx->wc_ctx,
- local_abspath, scratch_pool));
+ SVN_ERR(svn_wc__node_is_added(&is_added, ctx->wc_ctx, local_abspath,
+ scratch_pool));
SVN_ERR(svn_wc__node_get_repos_info(&repos_root, NULL,
ctx->wc_ctx, local_abspath, FALSE,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Tue Apr 20 01:42:48 2010
@@ -893,8 +893,7 @@ svn_client_propget3(apr_hash_t **props,
/* Get the actual_revnum; added nodes have no revision yet, and we
* return the mock-up revision of 0.
* ### TODO: get rid of this 0. */
- SVN_ERR(svn_wc__node_is_status_added(&added, ctx->wc_ctx, local_abspath,
- pool));
+ SVN_ERR(svn_wc__node_is_added(&added, ctx->wc_ctx, local_abspath, pool));
if (added)
revnum = 0;
else
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=935788&r1=935787&r2=935788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Apr 20 01:42:48 2010
@@ -570,10 +570,10 @@ svn_wc__node_is_status_present(svn_boole
}
svn_error_t *
-svn_wc__node_is_status_added(svn_boolean_t *is_added,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_wc__node_is_added(svn_boolean_t *is_added,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
@@ -584,7 +584,8 @@ svn_wc__node_is_status_added(svn_boolean
NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
- *is_added = (status == svn_wc__db_status_added);
+ *is_added = (status == svn_wc__db_status_added
+ || status == svn_wc__db_status_obstructed_add);
return SVN_NO_ERROR;
}