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 2017/07/31 16:41:47 UTC
svn commit: r1803554 - in /subversion/branches/addremove/subversion:
include/svn_client.h libsvn_client/addremove.c svn/addremove-cmd.c svn/svn.c
Author: stsp
Date: Mon Jul 31 16:41:47 2017
New Revision: 1803554
URL: http://svn.apache.org/viewvc?rev=1803554&view=rev
Log:
On the addremove branch: Add support for the --no-autoprops option.
* subversion/include/svn_client.h
(svn_client_addremove): Declare no_autoprops parameter.
* subversion/libsvn_client/addremove.c
(addremove): Add no_autoprops parameter and pass it on to
svn_client__add_file() and svn_client__add_dir_recursive().
(svn_client_addremove): Add no_autoprops parameter and pass it
on to addremove().
* subversion/svn/addremove-cmd.c
(svn_cl__addremove): Pass opt_state->no_autoprops to svn_client_addremove().
* subversion/svn/svn.c
(svn_cl__cmd_table): Add the --no-autoprops option to 'svn addremove'.
Modified:
subversion/branches/addremove/subversion/include/svn_client.h
subversion/branches/addremove/subversion/libsvn_client/addremove.c
subversion/branches/addremove/subversion/svn/addremove-cmd.c
subversion/branches/addremove/subversion/svn/svn.c
Modified: subversion/branches/addremove/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/include/svn_client.h?rev=1803554&r1=1803553&r2=1803554&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/include/svn_client.h (original)
+++ subversion/branches/addremove/subversion/include/svn_client.h Mon Jul 31 16:41:47 2017
@@ -1686,6 +1686,7 @@ svn_client_add(const char *path,
svn_error_t *
svn_client_addremove(const char *path,
svn_depth_t depth,
+ svn_boolean_t no_autoprops,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
/** @} */
Modified: subversion/branches/addremove/subversion/libsvn_client/addremove.c
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/libsvn_client/addremove.c?rev=1803554&r1=1803553&r2=1803554&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/libsvn_client/addremove.c (original)
+++ subversion/branches/addremove/subversion/libsvn_client/addremove.c Mon Jul 31 16:41:47 2017
@@ -94,6 +94,7 @@ addremove_status_func(void *baton, const
static svn_error_t *
addremove(const char *local_abspath, svn_depth_t depth,
+ svn_boolean_t no_autoprops,
svn_client_ctx_t *ctx, apr_pool_t *scratch_pool)
{
svn_magic__cookie_t *magic_cookie;
@@ -128,8 +129,8 @@ addremove(const char *local_abspath, svn
{
SVN_ERR(svn_client__add_file(unversioned_abspath,
magic_cookie,
- NULL, /* TODO: autoprops */
- TRUE, /* TODO: !no_autoprops */
+ NULL,
+ no_autoprops,
ctx, iterpool));
}
else if (kind_on_disk == svn_node_dir && depth >= svn_depth_immediates)
@@ -142,9 +143,9 @@ addremove(const char *local_abspath, svn
SVN_ERR(svn_client__add_dir_recursive(
unversioned_abspath, depth_below_here,
FALSE, /* force */
- TRUE, /* TODO: !no_autoprops */
+ no_autoprops,
magic_cookie,
- NULL, /* TODO: autoprops */
+ NULL,
FALSE, /* TODO: refresh_ignores */
NULL, /* TODO: ignores */
ctx, iterpool, iterpool));
@@ -174,6 +175,7 @@ addremove(const char *local_abspath, svn
svn_error_t *
svn_client_addremove(const char *local_path,
svn_depth_t depth,
+ svn_boolean_t no_autoprops,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
@@ -182,7 +184,7 @@ svn_client_addremove(const char *local_p
SVN_ERR(svn_dirent_get_absolute(&local_abspath, local_path, scratch_pool));
SVN_WC__CALL_WITH_WRITE_LOCK(
- addremove(local_abspath, depth, ctx, scratch_pool),
+ addremove(local_abspath, depth, no_autoprops, ctx, scratch_pool),
ctx->wc_ctx, local_abspath, TRUE, scratch_pool);
return SVN_NO_ERROR;
Modified: subversion/branches/addremove/subversion/svn/addremove-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/svn/addremove-cmd.c?rev=1803554&r1=1803553&r2=1803554&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/svn/addremove-cmd.c (original)
+++ subversion/branches/addremove/subversion/svn/addremove-cmd.c Mon Jul 31 16:41:47 2017
@@ -72,7 +72,9 @@ svn_cl__addremove(apr_getopt_t *os,
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
SVN_ERR(svn_cl__try
- (svn_client_addremove(target, opt_state->depth, ctx, iterpool),
+ (svn_client_addremove(target, opt_state->depth,
+ opt_state->no_autoprops,
+ ctx, iterpool),
errors, opt_state->quiet,
SVN_ERR_ENTRY_EXISTS,
SVN_ERR_WC_PATH_NOT_FOUND,
Modified: subversion/branches/addremove/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/svn/svn.c?rev=1803554&r1=1803553&r2=1803554&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/svn/svn.c (original)
+++ subversion/branches/addremove/subversion/svn/svn.c Mon Jul 31 16:41:47 2017
@@ -526,7 +526,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" The --depth option controls recursion (default: infinity).\n"
" Use 'svn revert' to undo any undesirable additions and deletions.\n"),
- {opt_targets, opt_depth }, },
+ {opt_targets, opt_depth, opt_no_autoprops }, },
{ "auth", svn_cl__auth, {0}, N_
("Manage cached authentication credentials.\n"