Author: stsp
Date: Mon Jul 4 15:32:55 2011
New Revision: 1142717
URL: http://svn.apache.org/viewvc?rev=1142717&view=rev
Log:
* subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/wc_db.h:
(svn_wc__db_get_absent_subtrees): Rename to ...
(svn_wc__db_get_server_excluded_subtrees): ... this, as part of the
absent -> server-excluded terminology change. Rename the 'absent_subtrees'
output parameter to 'server_excluded_subtrees'.
Also stop the docstring from implying that server-side exclusion was
always due to authz restrictions. The client doesn't really know or
care why the server doesn't want to talk about the node.
* subversion/libsvn_wc/node.c
(svn_wc__get_absent_subtrees): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1142717&r1=1142716&r2=1142717&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Mon Jul 4 15:32:55 2011
@@ -1306,11 +1306,12 @@ svn_wc__get_absent_subtrees(apr_hash_t *
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- return svn_error_trace(svn_wc__db_get_absent_subtrees(absent_subtrees,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
+ return svn_error_trace(
+ svn_wc__db_get_server_excluded_subtrees(absent_subtrees,
+ wc_ctx->db,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1142717&r1=1142716&r2=1142717&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 4 15:32:55 2011
@@ -11726,11 +11726,11 @@ svn_wc__db_has_switched_subtrees(svn_boo
}
svn_error_t *
-svn_wc__db_get_absent_subtrees(apr_hash_t **absent_subtrees,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_wc__db_get_server_excluded_subtrees(apr_hash_t **server_excluded_subtrees,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
@@ -11750,9 +11750,9 @@ svn_wc__db_get_absent_subtrees(apr_hash_
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (have_row)
- *absent_subtrees = apr_hash_make(result_pool);
+ *server_excluded_subtrees = apr_hash_make(result_pool);
else
- *absent_subtrees = NULL;
+ *server_excluded_subtrees = NULL;
while (have_row)
{
@@ -11760,7 +11760,8 @@ svn_wc__db_get_absent_subtrees(apr_hash_
svn_dirent_join(wcroot->abspath,
svn_sqlite__column_text(stmt, 0, scratch_pool),
result_pool);
- apr_hash_set(*absent_subtrees, abs_path, APR_HASH_KEY_STRING, abs_path);
+ apr_hash_set(*server_excluded_subtrees, abs_path, APR_HASH_KEY_STRING,
+ abs_path);
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1142717&r1=1142716&r2=1142717&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Jul 4 15:32:55 2011
@@ -2983,18 +2983,19 @@ svn_wc__db_has_switched_subtrees(svn_boo
const char *trail_url,
apr_pool_t *scratch_pool);
-/* Set @a *absent_subtrees to a hash mapping <tt>const char *</tt> local
- * absolute paths to <tt>const char *</tt> local absolute paths for every
- * path at or under @a local_abspath in @a db which are absent (excluded
- * by authz). If no absent paths are found then @a *absent_subtrees is set
- * to @c NULL. Allocate the hash and all items therein from @a result_pool.
+/* Set @a *server_excluded_subtrees to a hash mapping <tt>const char *</tt>
+ * local absolute paths to <tt>const char *</tt> local absolute paths for
+ * every path at or under @a local_abspath in @a db which are excluded by
+ * the server (e.g. due to authz). If no such paths are found then
+ * @a *server_excluded_subtrees is set to @c NULL.
+ * Allocate the hash and all items therein from @a result_pool.
*/
svn_error_t *
-svn_wc__db_get_absent_subtrees(apr_hash_t **absent_subtrees,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_wc__db_get_server_excluded_subtrees(apr_hash_t **server_excluded_subtrees,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Indicate in *IS_MODIFIED whether the working copy has local modifications,
* using DB. Use SCRATCH_POOL for temporary allocations.
