You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/05 02:31:04 UTC
svn commit: r1417261 - in /subversion/trunk/subversion: include/private/
libsvn_client/ libsvn_wc/
Author: julianfoad
Date: Wed Dec 5 01:31:02 2012
New Revision: 1417261
URL: http://svn.apache.org/viewvc?rev=1417261&view=rev
Log:
Rename svn_wc__strictly_is_wc_root() to svn_wc__is_wcroot() for consistency
with the name of the DB-layer equivalent function svn_wc__db_is_wcroot().
* subversion/include/private/svn_wc_private.h,
subversion/libsvn_wc/update_editor.c
(svn_wc__strictly_is_wc_root): Rename to svn_wc__is_wcroot. Update doc
string and rename the output parameter for consistency.
* subversion/libsvn_client/add.c
(svn_client_add5): Track the rename.
* subversion/libsvn_client/patch.c
(check_dir_empty): Track the rename.
* subversion/libsvn_client/revert.c
(svn_client_revert2): Track the rename.
* subversion/libsvn_client/switch.c
(switch_internal): Track the rename.
* subversion/libsvn_wc/relocate.c
(svn_wc_relocate4): Track the rename.
* subversion/libsvn_wc/wc_db.h,
subversion/libsvn_wc/wc_db.c
(svn_wc__db_is_wcroot): Refer to svn_wc_is_wc_root() for documentation.
Rename the output parameter for consistency.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/add.c
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_client/revert.c
subversion/trunk/subversion/libsvn_client/switch.c
subversion/trunk/subversion/libsvn_wc/relocate.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
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=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed Dec 5 01:31:02 2012
@@ -317,14 +317,18 @@ svn_wc__del_tree_conflict(svn_wc_context
const char *victim_abspath,
apr_pool_t *scratch_pool);
-/** Like svn_wc_is_wc_root(), but it doesn't consider switched subdirs or
+/** Check whether LOCAL_ABSPATH has a parent directory that knows about its
+ * existence. Set *IS_WCROOT to FALSE if a parent is found, and to TRUE
+ * if there is no such parent.
+ *
+ * Like svn_wc_is_wc_root(), but doesn't consider switched subdirs or
* deleted entries as working copy roots.
*/
svn_error_t *
-svn_wc__strictly_is_wc_root(svn_boolean_t *wc_root,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
+svn_wc__is_wcroot(svn_boolean_t *is_wcroot,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
/** Set @a *wcroot_abspath to the local abspath of the root of the
Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Wed Dec 5 01:31:02 2012
@@ -1119,11 +1119,11 @@ svn_client_add5(const char *path,
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool));
/* See if we're being asked to add a wc-root. That's typically not
- okay, unless we're in "force" mode. svn_wc__strictly_is_wc_root()
+ okay, unless we're in "force" mode. svn_wc__is_wcroot()
will return TRUE even if LOCAL_ABSPATH is a *symlink* to a working
copy root, which is a scenario we want to treat differently. */
- err = svn_wc__strictly_is_wc_root(&is_wc_root, ctx->wc_ctx,
- local_abspath, scratch_pool);
+ err = svn_wc__is_wcroot(&is_wc_root, ctx->wc_ctx, local_abspath,
+ scratch_pool);
if (err)
{
if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Dec 5 01:31:02 2012
@@ -2617,8 +2617,8 @@ check_dir_empty(svn_boolean_t *empty, co
int i;
/* Working copy root cannot be deleted, so never consider it empty. */
- SVN_ERR(svn_wc__strictly_is_wc_root(&is_wc_root, wc_ctx, local_abspath,
- scratch_pool));
+ SVN_ERR(svn_wc__is_wcroot(&is_wc_root, wc_ctx, local_abspath,
+ scratch_pool));
if (is_wc_root)
{
*empty = FALSE;
Modified: subversion/trunk/subversion/libsvn_client/revert.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/revert.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/revert.c (original)
+++ subversion/trunk/subversion/libsvn_client/revert.c Wed Dec 5 01:31:02 2012
@@ -166,8 +166,8 @@ svn_client_revert2(const apr_array_heade
baton.changelists = changelists;
baton.ctx = ctx;
- SVN_ERR(svn_wc__strictly_is_wc_root(&wc_root, ctx->wc_ctx,
- local_abspath, pool));
+ SVN_ERR(svn_wc__is_wcroot(&wc_root, ctx->wc_ctx, local_abspath,
+ pool));
lock_target = wc_root ? local_abspath
: svn_dirent_dirname(local_abspath, pool);
err = svn_wc__call_with_write_lock(revert, &baton, ctx->wc_ctx,
Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Wed Dec 5 01:31:02 2012
@@ -231,10 +231,8 @@ switch_internal(svn_revnum_t *result_rev
svn_boolean_t wc_root;
svn_boolean_t needs_iprop_cache = TRUE;
- SVN_ERR(svn_wc__strictly_is_wc_root(&wc_root,
- ctx->wc_ctx,
- local_abspath,
- pool));
+ SVN_ERR(svn_wc__is_wcroot(&wc_root, ctx->wc_ctx, local_abspath,
+ pool));
/* Switching the WC root to anything but the repos root means
we need an iprop cache. */
Modified: subversion/trunk/subversion/libsvn_wc/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/relocate.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_wc/relocate.c Wed Dec 5 01:31:02 2012
@@ -94,8 +94,8 @@ svn_wc_relocate4(svn_wc_context_t *wc_ct
const char *uuid;
svn_boolean_t is_wc_root;
- SVN_ERR(svn_wc__strictly_is_wc_root(&is_wc_root, wc_ctx, local_abspath,
- scratch_pool));
+ SVN_ERR(svn_wc__is_wcroot(&is_wc_root, wc_ctx, local_abspath,
+ scratch_pool));
if (! is_wc_root)
{
const char *wcroot_abspath;
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Dec 5 01:31:02 2012
@@ -5023,13 +5023,13 @@ svn_wc_check_root(svn_boolean_t *is_wcro
scratch_pool));
}
-svn_error_t*
-svn_wc__strictly_is_wc_root(svn_boolean_t *wc_root,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_error_t *
+svn_wc__is_wcroot(svn_boolean_t *is_wcroot,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
{
- return svn_error_trace(svn_wc__db_is_wcroot(wc_root,
+ return svn_error_trace(svn_wc__db_is_wcroot(is_wcroot,
wc_ctx->db,
local_abspath,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Dec 5 01:31:02 2012
@@ -12718,7 +12718,7 @@ svn_wc__db_node_hidden(svn_boolean_t *hi
svn_error_t *
-svn_wc__db_is_wcroot(svn_boolean_t *is_root,
+svn_wc__db_is_wcroot(svn_boolean_t *is_wcroot,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool)
@@ -12734,12 +12734,12 @@ svn_wc__db_is_wcroot(svn_boolean_t *is_r
if (*local_relpath != '\0')
{
- *is_root = FALSE; /* Node is a file, or has a parent directory within
+ *is_wcroot = FALSE; /* Node is a file, or has a parent directory within
the same wcroot */
return SVN_NO_ERROR;
}
- *is_root = TRUE;
+ *is_wcroot = TRUE;
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1417261&r1=1417260&r2=1417261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Dec 5 01:31:02 2012
@@ -2302,12 +2302,10 @@ svn_wc__db_node_check_replace(svn_boolea
### changelist usage -- we may already assume the list fits in memory.
*/
-/* Checks if LOCAL_ABSPATH has a parent directory that knows about its
- * existance. Set *IS_ROOT to FALSE if a parent is found, and to TRUE
- * if there is no such parent.
+/* The DB-private version of svn_wc__is_wcroot(), which see.
*/
svn_error_t *
-svn_wc__db_is_wcroot(svn_boolean_t *is_root,
+svn_wc__db_is_wcroot(svn_boolean_t *is_wcroot,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool);