You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/04 17:09:25 UTC
svn commit: r1142709 - in /subversion/trunk/subversion: libsvn_wc/crop.c
libsvn_wc/update_editor.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h
tests/libsvn_wc/db-test.c
Author: stsp
Date: Mon Jul 4 15:09:24 2011
New Revision: 1142709
URL: http://svn.apache.org/viewvc?rev=1142709&view=rev
Log:
Rename svn_wc__db_base_add_absent_node() to svn_wc__db_base_add_excluded_node()
for consistency.
* subversion/tests/libsvn_wc/db-test.c
(test_inserting_nodes, test_pdh): Update callers.
* subversion/libsvn_wc/crop.c
(svn_wc_exclude): Another caller.
* subversion/libsvn_wc/update_editor.c
(absent_node): Another caller. The term 'absent' is hardcoded in the
svn_delta_t interface, so we won't be renaming 'absent' to 'server-excluded'
above here.
* subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/wc_db.h
(svn_wc__db_base_add_absent_node): Rename this ...
(svn_wc__db_base_add_excluded_node): ... to this. Also fix a small error
in the docstring.
Modified:
subversion/trunk/subversion/libsvn_wc/crop.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
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1142709&r1=1142708&r2=1142709&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Mon Jul 4 15:09:24 2011
@@ -283,16 +283,16 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
cancel_func, cancel_baton,
scratch_pool));
- SVN_ERR(svn_wc__db_base_add_absent_node(wc_ctx->db,
- local_abspath,
- repos_relpath,
- repos_root,
- repos_uuid,
- revision,
- kind,
- svn_wc__db_status_excluded,
- NULL, NULL,
- scratch_pool));
+ SVN_ERR(svn_wc__db_base_add_excluded_node(wc_ctx->db,
+ local_abspath,
+ repos_relpath,
+ repos_root,
+ repos_uuid,
+ revision,
+ kind,
+ svn_wc__db_status_excluded,
+ NULL, NULL,
+ scratch_pool));
if (notify_func)
{
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1142709&r1=1142708&r2=1142709&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jul 4 15:09:24 2011
@@ -2885,16 +2885,16 @@ absent_node(const char *path,
const char *repos_relpath;
repos_relpath = svn_relpath_join(pb->new_relpath, name, scratch_pool);
- /* Insert an absent node below the parent node to note that this child
+ /* Insert an excluded node below the parent node to note that this child
is absent. (This puts it in the parent db if the child is obstructed) */
- SVN_ERR(svn_wc__db_base_add_absent_node(eb->db, local_abspath,
- repos_relpath, eb->repos_root,
- eb->repos_uuid,
- *(eb->target_revision),
- absent_kind,
- svn_wc__db_status_server_excluded,
- NULL, NULL,
- scratch_pool));
+ SVN_ERR(svn_wc__db_base_add_excluded_node(eb->db, local_abspath,
+ repos_relpath, eb->repos_root,
+ eb->repos_uuid,
+ *(eb->target_revision),
+ absent_kind,
+ svn_wc__db_status_server_excluded,
+ NULL, NULL,
+ scratch_pool));
}
svn_pool_destroy(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=1142709&r1=1142708&r2=1142709&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 4 15:09:24 2011
@@ -1867,17 +1867,17 @@ add_excluded_or_not_present_node(svn_wc_
svn_error_t *
-svn_wc__db_base_add_absent_node(svn_wc__db_t *db,
- const char *local_abspath,
- const char *repos_relpath,
- const char *repos_root_url,
- const char *repos_uuid,
- svn_revnum_t revision,
- svn_wc__db_kind_t kind,
- svn_wc__db_status_t status,
- const svn_skel_t *conflict,
- const svn_skel_t *work_items,
- apr_pool_t *scratch_pool)
+svn_wc__db_base_add_excluded_node(svn_wc__db_t *db,
+ const char *local_abspath,
+ const char *repos_relpath,
+ const char *repos_root_url,
+ const char *repos_uuid,
+ svn_revnum_t revision,
+ svn_wc__db_kind_t kind,
+ svn_wc__db_status_t status,
+ const svn_skel_t *conflict,
+ const svn_skel_t *work_items,
+ apr_pool_t *scratch_pool)
{
SVN_ERR_ASSERT(status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1142709&r1=1142708&r2=1142709&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Jul 4 15:09:24 2011
@@ -610,7 +610,7 @@ svn_wc__db_base_add_symlink(svn_wc__db_t
at revision REVISION.
The node's kind is described by KIND, and the reason for its absence
- is specified by STATUS. Only three values are allowed for STATUS:
+ is specified by STATUS. Only these values are allowed for STATUS:
svn_wc__db_status_server_excluded
svn_wc__db_status_excluded
@@ -624,17 +624,17 @@ svn_wc__db_base_add_symlink(svn_wc__db_t
All temporary allocations will be made in SCRATCH_POOL.
*/
svn_error_t *
-svn_wc__db_base_add_absent_node(svn_wc__db_t *db,
- const char *local_abspath,
- const char *repos_relpath,
- const char *repos_root_url,
- const char *repos_uuid,
- svn_revnum_t revision,
- svn_wc__db_kind_t kind,
- svn_wc__db_status_t status,
- const svn_skel_t *conflict,
- const svn_skel_t *work_items,
- apr_pool_t *scratch_pool);
+svn_wc__db_base_add_excluded_node(svn_wc__db_t *db,
+ const char *local_abspath,
+ const char *repos_relpath,
+ const char *repos_root_url,
+ const char *repos_uuid,
+ svn_revnum_t revision,
+ svn_wc__db_kind_t kind,
+ svn_wc__db_status_t status,
+ const svn_skel_t *conflict,
+ const svn_skel_t *work_items,
+ apr_pool_t *scratch_pool);
/* Create a node in the BASE tree that is present in name only.
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1142709&r1=1142708&r2=1142709&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Mon Jul 4 15:09:24 2011
@@ -656,7 +656,7 @@ test_inserting_nodes(apr_pool_t *pool)
pool));
/* Replace an incomplete node with an absent file node. */
- SVN_ERR(svn_wc__db_base_add_absent_node(
+ SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "N/N-b", pool),
"N/N-b", ROOT_ONE, UUID_ONE, 3,
svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
@@ -664,7 +664,7 @@ test_inserting_nodes(apr_pool_t *pool)
pool));
/* Create a new excluded directory node. */
- SVN_ERR(svn_wc__db_base_add_absent_node(
+ SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "P", pool),
"P", ROOT_ONE, UUID_ONE, 3,
svn_wc__db_kind_dir, svn_wc__db_status_excluded,
@@ -680,7 +680,7 @@ test_inserting_nodes(apr_pool_t *pool)
pool));
/* Create a new absent unknown-kind node. */
- SVN_ERR(svn_wc__db_base_add_absent_node(
+ SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "R", pool),
"R", ROOT_ONE, UUID_ONE, 3,
svn_wc__db_kind_unknown, svn_wc__db_status_server_excluded,
@@ -856,14 +856,14 @@ test_pdh(apr_pool_t *pool)
some internal functionality of wc_db. This is a handy driver for
debugging wc_db to ensure it manages per-directory handles properly. */
- SVN_ERR(svn_wc__db_base_add_absent_node(
+ SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "sub", pool),
"sub", ROOT_ONE, UUID_ONE, 1,
svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
- SVN_ERR(svn_wc__db_base_add_absent_node(
+ SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "sub/A", pool),
"sub/A", ROOT_ONE, UUID_ONE, 1,
svn_wc__db_kind_file, svn_wc__db_status_server_excluded,