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/12 17:47:50 UTC
svn commit: r1145637 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/merge.c libsvn_wc/node.c
Author: stsp
Date: Tue Jul 12 15:47:49 2011
New Revision: 1145637
URL: http://svn.apache.org/viewvc?rev=1145637&view=rev
Log:
Fix up another API affected by the 'absent' -> 'server-excluded' rename.
* subversion/include/private/svn_wc_private.h,
subversion/libsvn_wc/node.c
(svn_wc__get_absent_subtrees): Rename to ...
(svn_wc__get_server_excluded_subtrees): ... this. Rename output parameter
'absent_subtrees' to 'server_excluded_subtrees'.
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths): Adjust the only caller.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/merge.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=1145637&r1=1145636&r2=1145637&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Jul 12 15:47:49 2011
@@ -875,18 +875,20 @@ svn_wc__has_switched_subtrees(svn_boolea
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 wc_ctx 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 wc_ctx which are excluded
+ * by the server (e.g. because of authz).
+ * If no server-excluded 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__get_absent_subtrees(apr_hash_t **absent_subtrees,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_wc__get_server_excluded_subtrees(apr_hash_t **server_excluded_subtrees,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Indicate in @a *is_modified whether the working copy has local
* modifications, using context @a wc_ctx.
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1145637&r1=1145636&r2=1145637&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul 12 15:47:49 2011
@@ -5667,7 +5667,7 @@ get_mergeinfo_paths(apr_array_header_t *
int i;
apr_pool_t *iterpool = NULL;
apr_hash_t *subtrees_with_mergeinfo;
- apr_hash_t *absent_subtrees;
+ apr_hash_t *server_excluded_subtrees;
apr_hash_t *switched_subtrees;
apr_hash_t *shallow_subtrees;
apr_hash_t *missing_subtrees;
@@ -5868,16 +5868,16 @@ get_mergeinfo_paths(apr_array_header_t *
}
}
- /* Case 6: Paths absent from disk due to an authz restrictions. */
- SVN_ERR(svn_wc__get_absent_subtrees(&absent_subtrees,
- merge_cmd_baton->ctx->wc_ctx,
- merge_cmd_baton->target_abspath,
- result_pool, scratch_pool));
- if (absent_subtrees)
+ /* Case 6: Paths absent from disk due to server-side exclusion. */
+ SVN_ERR(svn_wc__get_server_excluded_subtrees(&server_excluded_subtrees,
+ merge_cmd_baton->ctx->wc_ctx,
+ merge_cmd_baton->target_abspath,
+ result_pool, scratch_pool));
+ if (server_excluded_subtrees)
{
apr_hash_index_t *hi;
- for (hi = apr_hash_first(scratch_pool, absent_subtrees);
+ for (hi = apr_hash_first(scratch_pool, server_excluded_subtrees);
hi;
hi = apr_hash_next(hi))
{
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1145637&r1=1145636&r2=1145637&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Jul 12 15:47:49 2011
@@ -1300,14 +1300,14 @@ svn_wc__node_get_lock_tokens_recursive(a
}
svn_error_t *
-svn_wc__get_absent_subtrees(apr_hash_t **absent_subtrees,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_wc__get_server_excluded_subtrees(apr_hash_t **server_excluded_subtrees,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
return svn_error_trace(
- svn_wc__db_get_server_excluded_subtrees(absent_subtrees,
+ svn_wc__db_get_server_excluded_subtrees(server_excluded_subtrees,
wc_ctx->db,
local_abspath,
result_pool,