Author: stefan2
Date: Sat Sep 2 14:35:54 2017
New Revision: 1807050
URL: http://svn.apache.org/viewvc?rev=1807050&view=rev
Log:
Revert r1806548.
Modified:
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnbench/svnbench.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1807050&r1=1807049&r2=1807050&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Sat Sep 2 14:35:54 2017
@@ -145,7 +145,6 @@ typedef enum svn_cl__longopt_t {
opt_show_item,
opt_adds_as_modification,
opt_vacuum_pristines,
- opt_pattern,
} svn_cl__longopt_t;
@@ -464,11 +463,6 @@ const apr_getopt_option_t svn_cl__option
{"vacuum-pristines", opt_vacuum_pristines, 0,
N_("remove unreferenced pristines from .svn
directory")},
- {"pattern", opt_pattern, 1,
- N_("use ARG as search pattern (glob syntax,\n"
- " "
- "case-sensitive)")},
-
/* Long-opt Aliases
*
* These have NULL desriptions, but an option code that matches some
@@ -816,7 +810,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" Size (in bytes)\n"
" Date and time of the last commit\n"),
{'r', 'v', 'R', opt_depth, opt_incremental, opt_xml,
- opt_include_externals, opt_pattern}, },
+ opt_include_externals, opt_search}, },
{ "lock", svn_cl__lock, {0}, N_
("Lock working copy paths or URLs in the repository, so that\n"
@@ -2526,10 +2520,6 @@ sub_main(int *exit_code, int argc, const
case opt_vacuum_pristines:
opt_state.vacuum_pristines = TRUE;
break;
- case opt_pattern:
- SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
- add_search_pattern_group(&opt_state, utf8_opt_arg, pool);
- break;
default:
/* Hmmm. Perhaps this would be a good place to squirrel away
opts that commands like svn diff might need. Hmmm indeed. */
Modified: subversion/trunk/subversion/svnbench/svnbench.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/svnbench.c?rev=1807050&r1=1807049&r2=1807050&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/svnbench.c (original)
+++ subversion/trunk/subversion/svnbench/svnbench.c Sat Sep 2 14:35:54 2017
@@ -69,7 +69,7 @@ typedef enum svn_cl__longopt_t {
opt_trust_server_cert,
opt_trust_server_cert_failures,
opt_changelist,
- opt_pattern
+ opt_search
} svn_cl__longopt_t;
@@ -166,10 +166,8 @@ const apr_getopt_option_t svn_cl__option
N_("use/display additional information from merge\n"
" "
"history")},
- {"pattern", opt_pattern, 1,
- N_("use ARG as search pattern (glob syntax,\n"
- " "
- "case-sensitive)")},
+ {"search", opt_search, 1,
+ N_("use ARG as search pattern (glob syntax)")},
/* Long-opt Aliases
*
@@ -262,7 +260,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
" Size (in bytes)\n"
" Date and time of the last commit\n"),
- {'r', 'v', 'q', 'R', opt_depth, opt_pattern} },
+ {'r', 'v', 'q', 'R', opt_depth, opt_search} },
{ "null-log", svn_cl__null_log, {0}, N_
("Fetch the log messages for a set of revision(s) and/or path(s).\n"
@@ -684,9 +682,13 @@ sub_main(int *exit_code, int argc, const
case 'g':
opt_state.use_merge_history = TRUE;
break;
- case opt_pattern:
+ case opt_search:
SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
- add_search_pattern_group(&opt_state, utf8_opt_arg, pool);
+ SVN_ERR(svn_utf__xfrm(&utf8_opt_arg, utf8_opt_arg,
+ strlen(utf8_opt_arg), TRUE, TRUE, &buf));
+ add_search_pattern_group(&opt_state,
+ apr_pstrdup(pool, utf8_opt_arg),
+ pool);
break;
default:
/* Hmmm. Perhaps this would be a good place to squirrel away
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1807050&r1=1807049&r2=1807050&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Sat Sep 2
14:35:54 2017
@@ -3126,7 +3126,7 @@ def filtered_ls(sbox):
"gamma\n" ]
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, [], 'ls', path, '--depth=infinity', '--pattern=*a')
+ None, [], 'ls', path, '--depth=infinity', '--search=*a')
########################################################################
# Run the tests
