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 2011/05/05 07:16:53 UTC
svn commit: r1099683 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_wc/adm_ops.c libsvn_wc/deprecated.c libsvn_wc/diff_editor.c
libsvn_wc/diff_local.c libsvn_wc/info.c libsvn_wc/node.c libsvn_wc/props.c
libsvn_wc/wc_db.c
Author: gstein
Date: Thu May 5 05:16:52 2011
New Revision: 1099683
URL: http://svn.apache.org/viewvc?rev=1099683&view=rev
Log:
For clarity, rename CHANGELIST param to NEW_CHANGELIST, and CHANGELISTS to
CHANGELIST_FILTER.
No functional changes, other than a minor structure change in adm_ops.c
* subversion/include/svn_wc.h:
(svn_wc_prop_set4, svn_wc_get_diff_editor6, svn_wc_get_diff_editor5,
svn_wc_get_diff_editor4, svn_wc_diff6, svn_wc_diff5, svn_wc_diff4,
svn_wc_revert4, svn_wc_revert3, svn_wc_set_changelist2,
svn_wc_get_changelists): rename params
* subversion/libsvn_wc/deprecated.c:
(svn_wc_revert3, svn_wc_get_diff_editor5, svn_wc_get_diff_editor4,
svn_wc_diff5, svn_wc_diff4): rename params
* subversion/libsvn_wc/props.c:
(svn_wc_prop_set4): rename params
* subversion/libsvn_wc/diff_editor.c:
(make_edit_baton, svn_wc_get_diff_editor6): rename params
* subversion/libsvn_wc/adm_ops.c:
(svn_wc_revert4): rename params
(struct changelist_walker_baton): rename fields. add CANCEL_FUNC/BATON
(changelist_walker): track rename in CWB. note that the new
CANCEL_FUNC/BATON fields are not (yet) used in order to avoid
functionality changes in this revision.
(svn_wc_set_changelist2): rename params. initialize new CANCEL fields.
(svn_wc_get_changelists): rename params
* subversion/libsvn_wc/info.c:
(svn_wc__get_info): rename params
* subversion/libsvn_wc/wc_db.c:
(struct set_changelist_baton_t): rename field
(set_changelist_txn): track rename in SCB.
(svn_wc__db_op_set_changelist): rename params
* subversion/libsvn_wc/diff_local.c:
(svn_wc_diff6): rename params
* subversion/libsvn_wc/node.c:
(walker_helper, svn_wc__internal_walk_children): rename params
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/diff_editor.c
subversion/trunk/subversion/libsvn_wc/diff_local.c
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu May 5 05:16:52 2011
@@ -5811,10 +5811,10 @@ svn_wc_prop_get(const svn_string_t **val
* entry property, return the error #SVN_ERR_BAD_PROP_KIND, even if
* @a skip_checks is TRUE.
*
- * @a changelists is an array of <tt>const char *</tt> changelist
+ * @a changelist_filter is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose properties are
* set; that is, don't set properties on any item unless it's a member
- * of one of those changelists. If @a changelists is empty (or
+ * of one of those changelists. If @a changelist_filter is empty (or
* altogether @c NULL), no changelist filtering occurs.
*
* For each file or directory operated on, @a notify_func will be called
@@ -5832,7 +5832,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
const svn_string_t *value,
svn_depth_t depth,
svn_boolean_t skip_checks,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool);
@@ -6011,10 +6011,10 @@ svn_wc_canonicalize_svn_prop(const svn_s
* If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
* to periodically check if the client has canceled the operation.
*
- * @a changelists is an array of <tt>const char *</tt> changelist
+ * @a changelist_filter is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose differences are
* reported; that is, don't generate diffs about any item unless
- * it's a member of one of those changelists. If @a changelists is
+ * it's a member of one of those changelists. If @a changelist_filter is
* empty (or altogether @c NULL), no changelist filtering occurs.
*
* If @a server_performs_filtering is TRUE, assume that the server handles
@@ -6036,7 +6036,7 @@ svn_wc_get_diff_editor6(const svn_delta_
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_boolean_t server_performs_filtering,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_wc_diff_callbacks4_t *callbacks,
void *callback_baton,
svn_cancel_func_t cancel_func,
@@ -6068,7 +6068,7 @@ svn_wc_get_diff_editor5(svn_wc_adm_acces
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
@@ -6091,13 +6091,13 @@ svn_wc_get_diff_editor4(svn_wc_adm_acces
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
- * Similar to svn_wc_get_diff_editor4(), but with @a changelists
+ * Similar to svn_wc_get_diff_editor4(), but with @a changelist_filter
* passed as @c NULL, and @a depth set to #svn_depth_infinity if @a
* recurse is TRUE, or #svn_depth_files if @a recurse is FALSE.
*
@@ -6195,10 +6195,10 @@ svn_wc_get_diff_editor(svn_wc_adm_access
* if they weren't modified after being copied. This allows the callbacks
* to generate appropriate --git diff headers for such files.
*
- * @a changelists is an array of <tt>const char *</tt> changelist
+ * @a changelist_filter is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose differences are
* reported; that is, don't generate diffs about any item unless
- * it's a member of one of those changelists. If @a changelists is
+ * it's a member of one of those changelists. If @a changelist_filter is
* empty (or altogether @c NULL), no changelist filtering occurs.
*
* If @a cancel_func is non-NULL, invoke it with @a cancel_baton at various
@@ -6216,7 +6216,7 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
svn_boolean_t ignore_ancestry,
svn_boolean_t show_copies_as_adds,
svn_boolean_t use_git_diff_format,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
@@ -6238,7 +6238,7 @@ svn_wc_diff5(svn_wc_adm_access_t *anchor
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
apr_pool_t *pool);
/**
@@ -6256,11 +6256,11 @@ svn_wc_diff4(svn_wc_adm_access_t *anchor
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
apr_pool_t *pool);
/**
- * Similar to svn_wc_diff4(), but with @a changelists passed @c NULL,
+ * Similar to svn_wc_diff4(), but with @a changelist_filter passed @c NULL,
* and @a depth set to #svn_depth_infinity if @a recurse is TRUE, or
* #svn_depth_files if @a recurse is FALSE.
*
@@ -6953,10 +6953,10 @@ svn_wc_relocate(const char *path,
* properties on immediate subdirectories; else if #svn_depth_infinity,
* revert path and everything under it fully recursively.
*
- * @a changelists is an array of <tt>const char *</tt> changelist
+ * @a changelist_filter is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items reverted; that is,
* don't revert any item unless it's a member of one of those
- * changelists. If @a changelists is empty (or altogether @c NULL),
+ * changelists. If @a changelist_filter is empty (or altogether @c NULL),
* no changelist filtering occurs.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
@@ -6982,7 +6982,7 @@ svn_wc_revert4(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
svn_boolean_t use_commit_times,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -7000,7 +7000,7 @@ svn_wc_revert3(const char *path,
svn_wc_adm_access_t *parent_access,
svn_depth_t depth,
svn_boolean_t use_commit_times,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -7008,7 +7008,7 @@ svn_wc_revert3(const char *path,
apr_pool_t *pool);
/**
- * Similar to svn_wc_revert3(), but with @a changelists passed as @c
+ * Similar to svn_wc_revert3(), but with @a changelist_filter passed as @c
* NULL, and @a depth set according to @a recursive: if @a recursive
* is TRUE, @a depth is #svn_depth_infinity; if FALSE, @a depth is
* #svn_depth_empty.
@@ -7525,11 +7525,11 @@ svn_wc_revision_status(svn_wc_revision_s
* changelist assignment from @a local_abspath. @a changelist may not
* be the empty string. Recurse to @a depth.
*
- * @a changelists is an array of <tt>const char *</tt> changelist
+ * @a changelist_filter is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose changelist
* assignments are adjusted; that is, don't tweak the changeset of any
* item unless it's currently a member of one of those changelists.
- * If @a changelists is empty (or altogether @c NULL), no changelist
+ * If @a changelist_filter is empty (or altogether @c NULL), no changelist
* filtering occurs.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton to
@@ -7556,7 +7556,7 @@ svn_wc_set_changelist2(svn_wc_context_t
const char *local_abspath,
const char *changelist,
svn_depth_t depth,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -7602,13 +7602,14 @@ svn_error_t *
svn_wc_get_changelists(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_changelist_receiver_t callback_func,
void *callback_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
+
/** Crop @a local_abspath according to @a depth.
*
* Remove any item that exceeds the boundary of @a depth (relative to
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu May 5 05:16:52 2011
@@ -1800,7 +1800,7 @@ svn_wc_revert4(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
svn_boolean_t use_commit_times,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -1809,8 +1809,9 @@ svn_wc_revert4(svn_wc_context_t *wc_ctx,
{
apr_hash_t *changelist_hash = NULL;
- if (changelists && changelists->nelts)
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelists, pool));
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
+ pool));
return svn_error_return(revert_internal(wc_ctx->db,
local_abspath, local_abspath, depth,
@@ -2234,10 +2235,13 @@ svn_wc_remove_lock2(svn_wc_context_t *wc
struct changelist_walker_baton
{
- const char *changelist;
- const apr_array_header_t *changelists;
+ const char *new_changelist;
+ const apr_array_header_t *changelist_filter;
svn_wc__db_t *db;
+
+ svn_cancel_func_t cancel_func;
+ void *cancel_baton;
svn_wc_notify_func2_t notify_func;
void *notify_baton;
};
@@ -2252,7 +2256,7 @@ changelist_walker(const char *local_absp
struct changelist_walker_baton *cwb = baton;
/* We can't add directories to changelists. */
- if (kind == svn_node_dir && cwb->changelist)
+ if (kind == svn_node_dir && cwb->new_changelist)
{
if (cwb->notify_func)
cwb->notify_func(cwb->notify_baton,
@@ -2266,8 +2270,8 @@ changelist_walker(const char *local_absp
/* Set the changelist. */
SVN_ERR(svn_wc__db_op_set_changelist(cwb->db, local_abspath,
- cwb->changelist,
- cwb->changelists,
+ cwb->new_changelist,
+ cwb->changelist_filter,
svn_depth_empty,
cwb->notify_func, cwb->notify_baton,
NULL, NULL /* cancellation */,
@@ -2280,20 +2284,23 @@ changelist_walker(const char *local_absp
svn_error_t *
svn_wc_set_changelist2(svn_wc_context_t *wc_ctx,
const char *local_abspath,
- const char *changelist,
+ const char *new_changelist,
svn_depth_t depth,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool)
{
- struct changelist_walker_baton cwb = { changelist, changelists, wc_ctx->db,
+ struct changelist_walker_baton cwb = { new_changelist,
+ changelist_filter,
+ wc_ctx->db,
+ cancel_func, cancel_baton,
notify_func, notify_baton };
/* Assert that we aren't being asked to set an empty changelist. */
- SVN_ERR_ASSERT(! (changelist && changelist[0] == '\0'));
+ SVN_ERR_ASSERT(! (new_changelist && new_changelist[0] == '\0'));
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -2388,7 +2395,7 @@ svn_error_t *
svn_wc_get_changelists(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_changelist_receiver_t callback_func,
void *callback_baton,
svn_cancel_func_t cancel_func,
@@ -2398,14 +2405,15 @@ svn_wc_get_changelists(svn_wc_context_t
struct get_cl_fn_baton gnb = { wc_ctx->db, NULL,
callback_func, callback_baton };
- if (changelists)
- SVN_ERR(svn_hash_from_cstring_keys(&gnb.clhash, changelists,
+ if (changelist_filter)
+ SVN_ERR(svn_hash_from_cstring_keys(&gnb.clhash, changelist_filter,
scratch_pool));
return svn_error_return(
svn_wc__internal_walk_children(wc_ctx->db, local_abspath, FALSE,
- changelists, get_node_changelist, &gnb,
- depth, cancel_func, cancel_baton,
+ changelist_filter, get_node_changelist,
+ &gnb, depth,
+ cancel_func, cancel_baton,
scratch_pool));
}
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Thu May 5 05:16:52 2011
@@ -927,7 +927,7 @@ svn_wc_revert3(const char *path,
svn_wc_adm_access_t *parent_access,
svn_depth_t depth,
svn_boolean_t use_commit_times,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -945,7 +945,7 @@ svn_wc_revert3(const char *path,
local_abspath,
depth,
use_commit_times,
- changelists,
+ changelist_filter,
cancel_func, cancel_baton,
notify_func, notify_baton,
pool));
@@ -1852,7 +1852,7 @@ svn_wc_get_diff_editor5(svn_wc_adm_acces
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool)
@@ -1881,7 +1881,7 @@ svn_wc_get_diff_editor5(svn_wc_adm_acces
use_text_base,
reverse_order,
FALSE,
- changelists,
+ changelist_filter,
&diff_callbacks3_wrapper,
b,
cancel_func,
@@ -1905,7 +1905,7 @@ svn_wc_get_diff_editor4(svn_wc_adm_acces
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool)
@@ -1923,7 +1923,7 @@ svn_wc_get_diff_editor4(svn_wc_adm_acces
reverse_order,
cancel_func,
cancel_baton,
- changelists,
+ changelist_filter,
editor,
edit_baton,
pool);
@@ -2012,7 +2012,7 @@ svn_wc_diff5(svn_wc_adm_access_t *anchor
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
apr_pool_t *pool)
{
struct diff_callbacks3_wrapper_baton *b = apr_palloc(pool, sizeof(*b));
@@ -2034,7 +2034,7 @@ svn_wc_diff5(svn_wc_adm_access_t *anchor
ignore_ancestry,
FALSE,
FALSE,
- changelists,
+ changelist_filter,
NULL, NULL,
pool));
@@ -2048,7 +2048,7 @@ svn_wc_diff4(svn_wc_adm_access_t *anchor
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
apr_pool_t *pool)
{
struct diff_callbacks2_wrapper_baton *b = apr_palloc(pool, sizeof(*b));
@@ -2056,7 +2056,7 @@ svn_wc_diff4(svn_wc_adm_access_t *anchor
b->baton = callback_baton;
return svn_wc_diff5(anchor, target, &diff_callbacks2_wrapper, b,
- depth, ignore_ancestry, changelists, pool);
+ depth, ignore_ancestry, changelist_filter, pool);
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Thu May 5 05:16:52 2011
@@ -335,7 +335,7 @@ struct file_baton {
* against working files or text-bases. REVERSE_ORDER defines which
* direction to perform the diff.
*
- * CHANGELISTS is a list of const char * changelist names, used to
+ * CHANGELIST_FILTER is a list of const char * changelist names, used to
* filter diff output responses to only those items in one of the
* specified changelists, empty (or NULL altogether) if no changelist
* filtering is requested.
@@ -353,7 +353,7 @@ make_edit_baton(struct edit_baton **edit
svn_boolean_t use_git_diff_format,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)
@@ -363,8 +363,9 @@ make_edit_baton(struct edit_baton **edit
SVN_ERR_ASSERT(svn_dirent_is_absolute(anchor_abspath));
- if (changelists && changelists->nelts)
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelists, pool));
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
+ pool));
eb = apr_pcalloc(pool, sizeof(*eb));
eb->db = db;
@@ -1881,7 +1882,7 @@ svn_wc_get_diff_editor6(const svn_delta_
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_boolean_t server_performs_filtering,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
const svn_wc_diff_callbacks4_t *callbacks,
void *callback_baton,
svn_cancel_func_t cancel_func,
@@ -1902,7 +1903,7 @@ svn_wc_get_diff_editor6(const svn_delta_
callbacks, callback_baton,
depth, ignore_ancestry, show_copies_as_adds,
use_git_diff_format,
- use_text_base, reverse_order, changelists,
+ use_text_base, reverse_order, changelist_filter,
cancel_func, cancel_baton,
result_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Thu May 5 05:16:52 2011
@@ -519,7 +519,7 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
svn_boolean_t ignore_ancestry,
svn_boolean_t show_copies_as_adds,
svn_boolean_t use_git_diff_format,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool)
@@ -546,8 +546,8 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
eb.empty_file = NULL;
eb.pool = scratch_pool;
- if (changelists && changelists->nelts)
- SVN_ERR(svn_hash_from_cstring_keys(&eb.changelist_hash, changelists,
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&eb.changelist_hash, changelist_filter,
scratch_pool));
if (show_copies_as_adds || use_git_diff_format)
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu May 5 05:16:52 2011
@@ -321,7 +321,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
svn_depth_t depth,
svn_info_receiver2_t receiver,
void *receiver_baton,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool)
@@ -333,10 +333,13 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
fe_baton.receiver_baton = receiver_baton;
fe_baton.db = wc_ctx->db;
- err = svn_wc__internal_walk_children(wc_ctx->db, local_abspath, FALSE,
- changelists, info_found_node_callback,
- &fe_baton, depth, cancel_func,
- cancel_baton, scratch_pool);
+ err = svn_wc__internal_walk_children(wc_ctx->db, local_abspath,
+ FALSE /* show_hidden */,
+ changelist_filter,
+ info_found_node_callback,
+ &fe_baton, depth,
+ cancel_func, cancel_baton,
+ scratch_pool);
/* If the target root node is not present, svn_wc__internal_walk_children()
returns a PATH_NOT_FOUND error and doesn't call the callback. In this
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu May 5 05:16:52 2011
@@ -589,7 +589,7 @@ static svn_error_t *
walker_helper(svn_wc__db_t *db,
const char *dir_abspath,
svn_boolean_t show_hidden,
- const apr_hash_t *changelists,
+ const apr_hash_t *changelist_filter,
svn_wc__node_found_func_t walk_callback,
void *walk_baton,
svn_depth_t depth,
@@ -643,7 +643,8 @@ walker_helper(svn_wc__db_t *db,
if ( (child_kind == svn_wc__db_kind_file
|| depth >= svn_depth_immediates)
&& svn_wc__internal_changelist_match(db, child_abspath,
- changelists, scratch_pool) )
+ changelist_filter,
+ scratch_pool) )
{
svn_node_kind_t kind;
@@ -666,9 +667,11 @@ walker_helper(svn_wc__db_t *db,
if (depth == svn_depth_immediates)
depth_below_here = svn_depth_empty;
- SVN_ERR(walker_helper(db, child_abspath, show_hidden, changelists,
+ SVN_ERR(walker_helper(db, child_abspath, show_hidden,
+ changelist_filter,
walk_callback, walk_baton,
- depth_below_here, cancel_func, cancel_baton,
+ depth_below_here,
+ cancel_func, cancel_baton,
iterpool));
}
}
@@ -683,7 +686,7 @@ svn_error_t *
svn_wc__internal_walk_children(svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t show_hidden,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_wc__node_found_func_t walk_callback,
void *walk_baton,
svn_depth_t walk_depth,
@@ -699,8 +702,8 @@ svn_wc__internal_walk_children(svn_wc__d
SVN_ERR_ASSERT(walk_depth >= svn_depth_empty
&& walk_depth <= svn_depth_infinity);
- if (changelists && changelists->nelts)
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelists,
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
scratch_pool));
/* Check if the node exists before the first callback */
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu May 5 05:16:52 2011
@@ -2216,7 +2216,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
const svn_string_t *value,
svn_depth_t depth,
svn_boolean_t skip_checks,
- const apr_array_header_t *changelists,
+ const apr_array_header_t *changelist_filter,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool)
@@ -2257,8 +2257,8 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
{
apr_hash_t *changelist_hash = NULL;
- if (changelists && changelists->nelts)
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelists,
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
scratch_pool));
if (!svn_wc__internal_changelist_match(wc_ctx->db, local_abspath,
@@ -2278,7 +2278,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
notify_func, notify_baton };
SVN_ERR(svn_wc__internal_walk_children(wc_ctx->db, local_abspath,
- FALSE, changelists,
+ FALSE, changelist_filter,
propset_walk_cb, &wb,
depth,
NULL, NULL, /* cancellation */
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1099683&r1=1099682&r2=1099683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May 5 05:16:52 2011
@@ -3462,7 +3462,7 @@ svn_wc__db_op_modified(svn_wc__db_t *db,
struct set_changelist_baton_t
{
const char *new_changelist;
- const apr_array_header_t *changelists;
+ const apr_array_header_t *changelist_filter;
};
@@ -3477,9 +3477,9 @@ set_changelist_txn(void *baton,
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
- /* If we are filtering based on changelists, we *must* already have nodes,
- * so we can skip this check. */
- if (scb->changelists && scb->changelists->nelts > 0)
+ /* If we are filtering based on changelist_filter, we *must* already have
+ nodes, so we can skip this check. */
+ if (scb->changelist_filter && scb->changelist_filter->nelts > 0)
have_row = TRUE;
else
{
@@ -3507,7 +3507,7 @@ set_changelist_txn(void *baton,
svn_relpath_dirname(local_relpath,
scratch_pool)));
}
- else if (!scb->changelists || scb->changelists->nelts == 0)
+ else if (!scb->changelist_filter || scb->changelist_filter->nelts == 0)
{
/* No filtering going on: we can just use the simple statement. */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -3522,9 +3522,10 @@ set_changelist_txn(void *baton,
/* Start with the second changelist in the list of changelist filters.
In the case where we only have one changelist filter, this loop is
skipped, and we get simple single-query execution. */
- for (i = 1; i < scb->changelists->nelts; i++)
+ for (i = 1; i < scb->changelist_filter->nelts; i++)
{
- const char *cl = APR_ARRAY_IDX(scb->changelists, i, const char *);
+ const char *cl = APR_ARRAY_IDX(scb->changelist_filter, i,
+ const char *);
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_UPDATE_ACTUAL_CHANGELIST_FILTER_CHANGELIST));
@@ -3538,7 +3539,7 @@ set_changelist_txn(void *baton,
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_UPDATE_ACTUAL_CHANGELIST_FILTER_CHANGELIST));
SVN_ERR(svn_sqlite__bind_text(stmt, 4,
- APR_ARRAY_IDX(scb->changelists, 0,
+ APR_ARRAY_IDX(scb->changelist_filter, 0,
const char *)));
}
@@ -3564,8 +3565,8 @@ set_changelist_txn(void *baton,
svn_error_t *
svn_wc__db_op_set_changelist(svn_wc__db_t *db,
const char *local_abspath,
- const char *changelist,
- const apr_array_header_t *changelists,
+ const char *new_changelist,
+ const apr_array_header_t *changelist_filter,
svn_depth_t depth,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
@@ -3575,7 +3576,7 @@ svn_wc__db_op_set_changelist(svn_wc__db_
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct set_changelist_baton_t scb = { changelist, changelists };
+ struct set_changelist_baton_t scb = { new_changelist, changelist_filter };
struct with_triggers_baton_t wtb = { STMT_CREATE_CHANGELIST_LIST,
STMT_DROP_CHANGELIST_LIST_TRIGGERS,
NULL, NULL };