subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1497395 - /subversion/trunk/subversion/libsvn_client/cleanup.c
Date Thu, 27 Jun 2013 15:28:08 GMT
Author: stsp
Date: Thu Jun 27 15:28:07 2013
New Revision: 1497395

URL: http://svn.apache.org/r1497395
Log:
* subversion/libsvn_client/cleanup.c
  (do_cleanup): Honour user-configured default ignore list, as well as
   ignore patterns defined on the cleanup target.

Modified:
    subversion/trunk/subversion/libsvn_client/cleanup.c

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1497395&r1=1497394&r2=1497395&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Thu Jun 27 15:28:07 2013
@@ -109,18 +109,22 @@ do_cleanup(const char *local_abspath,
   if (remove_unversioned_items || remove_ignored_items || include_externals)
     {
       struct cleanup_status_walk_baton b;
+      apr_array_header_t *ignores = NULL;
 
       b.include_externals = include_externals;
       b.remove_unversioned_items = remove_unversioned_items;
       b.remove_ignored_items = remove_ignored_items;
       b.include_externals = include_externals;
       b.ctx = ctx;
+      if (remove_ignored_items)
+        SVN_ERR(svn_wc_get_ignores2(&ignores, ctx->wc_ctx, local_abspath,
+                                    ctx->config, scratch_pool, scratch_pool));
       SVN_ERR(svn_wc_walk_status(ctx->wc_ctx, local_abspath,
                                  svn_depth_infinity,
                                  TRUE,  /* get all */
                                  remove_ignored_items,
                                  TRUE,  /* ignore textmods */
-                                 NULL,  /* use default ignore patterns */
+                                 ignores,
                                  cleanup_status_walk, &b,
                                  ctx->cancel_func,
                                  ctx->cancel_baton,



Mime
View raw message