>>
>> - if (svn_cstring_match_glob_list (this_entry.name, ignores)) -
>> continue;
>> + if (!no_ignore)
>> + {
>> + if (svn_cstring_match_glob_list (this_entry.name, ignores))
>> + continue;
>> + }
>>
>
> this could be written more compactly with just one if statement (but it
> is mostly a matte of taste).
I have corrected this as well, v3 of patch attached.
Log:
Fix issue #2105. Add "--no-ignore" switch to 'svn import'.
* subversion/include/svn_client.h
(svn_client_import) : Marked function as deprecated.
(svn_client_import2) : Added prototype for new function and doc
string.
(svn_client_add2) : Marked function as deprecated.
(svn_client_add3) : Added prototype for new function and doc
string.
* subversion/libsvn_client/commit.c
(svn_client_import) : Re-implemented in terms of new function,
'svn_client_import2()'.
(svn_client_import2) : New function. Same as the older function
'svn_client_import()' except for the additional boolean
parameter 'no_ignore'. Setting 'no_ignore' to TRUE results
in files and directories that match ignore patterns to be
imported.
(import_dir) : Added parameter 'no_ignore' to function.
Calling 'import_dir()' with 'no_ignore' set to TRUE results
in files directories that match ignore patterns to be imported.
(import) : Added parameter 'no_ignore' to function.
Calling 'import()' with 'no_ignore' set to TRUE results
in files and directories that match ignore patterns to be
imported.
* subversion/libsvn_client/add.c
(svn_client_add) : Modified to call 'add()' with 'no_ignore'
always set to FALSE.
(svn_client_add2) : Re-implemented in terms of new function
'svn_client_add3()'.
(svn_client_add3) : New function. Same as the older function
'svn_client_add2()' except for the additional boolean
parameter 'no_ignore'. Setting 'no_ignore' to TRUE results
in files and directories that match default ignore patterns
to be be added during recursive directory adds.
(add) : Added boolean parameter 'no_ignore' to function and pass
this additional parameter to 'add_dir_recursive()'
(add_dir_recursive) : Added boolean parameter 'no_ignore' to
function. Files and directories that match default ignore
patterns are ignored if no_ignore is TRUE.
* subversion/clients/cmdline/import-cmd.c
(svn_cl__import) : Modified to call the new function
'svn_client_import2()'.
* subversion/clients/cmdline/main.c
(svn_cl__cmd_table) : Added '--no-ignore' command line option to
'svn import' and 'svn add'.
* subversion/tests/clients/cmdline/import_tests.py
(test_list) : Added new test 'import_no_ignores()' to list of
import tests.
(import_no_ignores) : New test. Verifies that files which match
ignore patterns can be imported with the '--no-ignore' option.
* subversion/tests/clients/cmdline/basic_tests.py
(test_list) : Added new test 'basic_add_no_ignores()' to list
of basic tests.
(basic_add_no_ignores) : New test. Verfies that files which
match ignore patterns can be added with the '--no-ignore'
option.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 24 09:41:34 2005