subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1803555 - in /subversion/branches/addremove/subversion: include/svn_client.h libsvn_client/addremove.c svn/addremove-cmd.c svn/svn.c
Date Mon, 31 Jul 2017 16:49:36 GMT
Author: stsp
Date: Mon Jul 31 16:49:35 2017
New Revision: 1803555

URL: http://svn.apache.org/viewvc?rev=1803555&view=rev
Log:
On the addremove branch: Add support for the --no-ignore option.

* subversion/include/svn_client.h
  (svn_client_addremove): Declare no_ignore parameter.

* subversion/libsvn_client/addremove.c
  (addremove): Add no_ignore parameter and pass it on to
   svn_client__add_dir_recursive().
  (svn_client_addremove): Add no_ignore parameter and pass it on to addremove().

* subversion/svn/addremove-cmd.c
  (svn_cl__addremove): Pass opt_state->no_ignore to svn_client_addremove().
  
* subversion/svn/svn.c
  (svn_cl__cmd_table): Add the --no-ignore 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=1803555&r1=1803554&r2=1803555&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/include/svn_client.h (original)
+++ subversion/branches/addremove/subversion/include/svn_client.h Mon Jul 31 16:49:35 2017
@@ -1687,6 +1687,7 @@ svn_error_t *
 svn_client_addremove(const char *path,
                      svn_depth_t depth,
                      svn_boolean_t no_autoprops,
+                     svn_boolean_t no_ignore,
                      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=1803555&r1=1803554&r2=1803555&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/libsvn_client/addremove.c (original)
+++ subversion/branches/addremove/subversion/libsvn_client/addremove.c Mon Jul 31 16:49:35
2017
@@ -94,7 +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_boolean_t no_autoprops, svn_boolean_t no_ignore,
           svn_client_ctx_t *ctx, apr_pool_t *scratch_pool)
 {
   svn_magic__cookie_t *magic_cookie;
@@ -146,8 +146,8 @@ addremove(const char *local_abspath, svn
                     no_autoprops,
                     magic_cookie,
                     NULL,
-                    FALSE, /* TODO: refresh_ignores */
-                    NULL, /* TODO: ignores */
+                    !no_ignore,
+                    NULL,
                     ctx, iterpool, iterpool));
         }
     }
@@ -176,6 +176,7 @@ svn_error_t *
 svn_client_addremove(const char *local_path,
                      svn_depth_t depth,
                      svn_boolean_t no_autoprops,
+                     svn_boolean_t no_ignore,
                      svn_client_ctx_t *ctx,
                      apr_pool_t *scratch_pool)
 {
@@ -184,7 +185,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, no_autoprops, ctx, scratch_pool),
+    addremove(local_abspath, depth, no_autoprops, no_ignore, 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=1803555&r1=1803554&r2=1803555&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/svn/addremove-cmd.c (original)
+++ subversion/branches/addremove/subversion/svn/addremove-cmd.c Mon Jul 31 16:49:35 2017
@@ -74,6 +74,7 @@ svn_cl__addremove(apr_getopt_t *os,
       SVN_ERR(svn_cl__try
               (svn_client_addremove(target, opt_state->depth,
                                     opt_state->no_autoprops,
+                                    opt_state->no_ignore,
                                     ctx, iterpool),
                errors, opt_state->quiet,
                SVN_ERR_ENTRY_EXISTS,

Modified: subversion/branches/addremove/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/svn/svn.c?rev=1803555&r1=1803554&r2=1803555&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/svn/svn.c (original)
+++ subversion/branches/addremove/subversion/svn/svn.c Mon Jul 31 16:49:35 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_no_autoprops }, },
+    {opt_targets, opt_depth, opt_no_autoprops, opt_no_ignore }, },
 
   { "auth", svn_cl__auth, {0}, N_
    ("Manage cached authentication credentials.\n"



Mime
View raw message