Karl Fogel kfogel@newton.ch.collab.net writes:
...which is quite understandable, since apr_fnmatch.h is not included
by config.c :-).
DOH! That isn't the only problem with that patch... I put the
patch into the message i was composing before the build/check
finished and never replaced it with the correct patch, which is
included below.
Also, if you have time to add a regression test, that would be great.
Should be pretty short simple, for this.
Yeah, OK. I've never peeked into Subversion's test suite before.
I'll try to come up with something tomorrow night.
Index: subversion/include/svn_config.h
===================================================================
--- subversion/include/svn_config.h (revision 4549)
+++ subversion/include/svn_config.h (working copy)
@@ -207,6 +207,20 @@
svn_error_t *svn_config_ensure (apr_pool_t *pool);
+/** Get the run-time configured list of ignore patterns, and store
+ * them in @a patterns. Allocate @a patterns and its contents in @a
+ * pool.
+ */
+svn_error_t *svn_config_get_default_ignores (apr_array_header_t **patterns,
+ apr_pool_t *pool);
+
+/** Determine whether a @a path matches the run-time configured list
+ * of ignore patterns, specified by the array @a ignores.
+ */
+svn_boolean_t svn_config_is_ignored (const char *path,
+ apr_array_header_t *ignores);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 4549)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -23,7 +23,6 @@
#include apr_file_io.h
#include apr_hash.h
#include apr_time.h
-#include apr_fnmatch.h
#include svn_pools.h
#include svn_types.h
#include svn_string.h
@@ -36,28 +35,6 @@
#include props.h
-/* Get the run-time configured list of ignore patterns, and store them
- in *PATTERNS. Allocate *PATTERNS and its contents in POOL. */
-static svn_error_t *
-get_default_ignores (apr_array_header_t **patterns,
- apr_pool_t *pool)
-{
- struct svn_config_t *cfg;
- const char *val;
-
- /* Check the Subversion run-time configuration for global ignores.
- If no configuration value exists, we fall back to our defaults. */
- SVN_ERR (svn_config_read_config (cfg, pool));
- svn_config_get (cfg, val, miscellany, global-ignores,
- *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*);
- *patterns = apr_array_make (pool, 16, sizeof (const char *));
-
- /* Split the patterns on whitespace, and stuff them into *PATTERNS. */
- svn_cstring_split_append (*patterns, val, \n\r\t\v , FALSE, pool);
- return SVN_NO_ERROR;
-}
-
-
/* Helper routine: add to *PATTERNS patterns from the value of
the SVN_PROP_IGNORE property set on DIRPATH. If there is no such
property, or the property contains no patterns, do nothing.
@@ -433,7 +410,6 @@
apr_ssize_t klen;
void *val;
const char *keystring;
- int i;
int ignore_me;
const char *printable_path;
svn_node_kind_t *path_kind;
@@ -450,22 +426,8 @@
if (! strcmp (keystring, SVN_WC_ADM_DIR_NAME))
continue;
- ignore_me = 0;
+ ignore_me = svn_config_is_ignored (keystring, patterns);
- /* See if any of the ignore patterns we have matches our
- keystring. */
- for (i = 0; patterns (i patterns-nelts); i++)
- {
- const char *pat = (((const char **) (patterns)-elts))[i];
-
- /* Try to match current_entry_name to pat. */
- if (APR_SUCCESS == apr_fnmatch (pat, keystring, FNM_PERIOD))
- {
- ignore_me = 1;
- break;
- }
- }
-
/* If we aren't ignoring it, add a status structure for this
dirent. */
if (no_ignore || ! ignore_me)
@@ -557,7 +519,7 @@
SVN_ERR (svn_wc_entries_read (entries, adm_access, FALSE, pool));
/* Read the default ignores from the config files. */
- SVN_ERR (get_default_ignores (ignores, pool));
+ SVN_ERR (svn_config_get_default_ignores (ignores, pool));
/* Add the unversioned items to the status output. */
SVN_ERR (add_unversioned_items (path, adm_access, entries, statushash,
Index: subversion/libsvn_subr/config.c
===================================================================
--- subversion/libsvn_subr/config.c (revision 4549)
+++ subversion/libsvn_subr/config.c (working copy)
@@ -22,6 +22,7 @@
#define APR_WANT_MEMFUNC
#include apr_want.h
+#include apr_fnmatch.h
#include apr_lib.h
#include apr_user.h
#include svn_error.h
@@ -533,4 +534,40 @@
gb.pool = pool;
svn_config_enumerate (cfg, master_section, search_groups, );
return gb.match;
+}
+
+svn_error_t *
+svn_config_get_default_ignores (apr_array_header_t **patterns,
+ apr_pool_t *pool)
+{
+ struct svn_config_t *cfg;
+ const char *val;
+
+ /* Check the Subversion run-time configuration for global ignores.
+ If no configuration value exists, we fall back to our defaults. */
+ SVN_ERR (svn_config_read_config (cfg, pool));
+ svn_config_get (cfg, val, miscellany, global-ignores,
+ *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*);
+ *patterns = apr_array_make (pool, 16, sizeof (const char *));
+
+ /* Split the patterns on whitespace, and stuff them into *PATTERNS. */
+ svn_cstring_split_append (*patterns, val, \n\r\t\v , FALSE, pool);
+ return SVN_NO_ERROR;
+}
+
+svn_boolean_t
+svn_config_is_ignored (const char *path,
+ apr_array_header_t *ignores)
+{
+ int i;
+
+ for (i = 0; ignores (i ignores-nelts); i++)
+ {
+ const char *pat = (((const char **) (ignores)-elts))[i];
+
+ if (APR_SUCCESS == apr_fnmatch (pat, path, FNM_PERIOD))
+ return TRUE;
+ }
+
+ return FALSE;
}
Index: subversion/libsvn_client/add.c
===================================================================
--- subversion/libsvn_client/add.c (revision 4549)
+++ subversion/libsvn_client/add.c (working copy)
@@ -25,6 +25,7 @@
#include string.h
#include svn_wc.h
#include svn_client.h
+#include svn_config.h
#include svn_string.h
#include svn_pools.h
#include svn_error.h
@@ -49,6 +50,7 @@
apr_pool_t *subpool;
apr_int32_t flags = APR_FINFO_TYPE | APR_FINFO_NAME;
svn_wc_adm_access_t *dir_access;
+ apr_array_header_t *ignores;
/* Add this directory to revision control. */
SVN_ERR (svn_wc_add (dirname, adm_access,
@@ -57,6 +59,8 @@
SVN_ERR (svn_wc_adm_retrieve (dir_access, adm_access, dirname, pool));
+ SVN_ERR (svn_config_get_default_ignores (ignores, pool));
+
/* Create a subpool for iterative memory control. */
subpool = svn_pool_create (pool);
@@ -77,6 +81,9 @@
if (this_entry.name[0] == '.'
(this_entry.name[1] == '\0'
|| (this_entry.name[1] == '.' this_entry.name[2] == '\0')))
+ continue;
+
+ if (svn_config_is_ignored (this_entry.name, ignores))
continue;
/* Construct the full path of the entry. */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:12:19 2006