Author: svn-role
Date: Fri Jan 5 04:00:16 2018
New Revision: 1820250
URL: http://svn.apache.org/viewvc?rev=1820250&view=rev
Log:
Merge the r1819036 group from trunk:
* r1819036, r1819043
Switch 'svn ls --search' on Windows to sub-string matching.
Justification:
The new feature was mostly unusable on the Windows CLI. With this
CLI-only work-around, it becomes worthwhile again.
Votes:
+1: stefan2, jamessan, brane
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/svn/list-cmd.c
subversion/branches/1.10.x/subversion/svn/svn.c
subversion/branches/1.10.x/subversion/tests/cmdline/basic_tests.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 5 04:00:16 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818578,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819037,1819049,1819052,1819093,1819162,1819444,1819556-1819557,1819603,1819911
+/subversion/trunk:1817837,1817856,1818578,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819162,1819444,1819556-1819557,1819603,1819911
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1820250&r1=1820249&r2=1820250&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jan 5 04:00:16 2018
@@ -29,14 +29,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1819036, r1819043
- Switch 'svn ls --search' on Windows to sub-string matching.
- Justification:
- The new feature was mostly unusable on the Windows CLI. With this
- CLI-only work-around, it becomes worthwhile again.
- Votes:
- +1: stefan2, jamessan, brane
-
* r1818584
Fix crash when exiting 'svnserve --config-file'.
Justification:
Modified: subversion/branches/1.10.x/subversion/svn/list-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/list-cmd.c?rev=1820250&r1=1820249&r2=1820250&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/list-cmd.c (original)
+++ subversion/branches/1.10.x/subversion/svn/list-cmd.c Fri Jan 5 04:00:16
2018
@@ -385,14 +385,20 @@ svn_cl__list(apr_getopt_t *os,
apr_array_header_t *pattern_group
= APR_ARRAY_IDX(opt_state->search_patterns, k,
apr_array_header_t *);
+ const char *pattern;
/* Should never fail but ... */
if (pattern_group->nelts != 1)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'search-and' option is not supported"));
- APR_ARRAY_PUSH(patterns, const char *)
- = APR_ARRAY_IDX(pattern_group, 0, const char *);
+ pattern = APR_ARRAY_IDX(pattern_group, 0, const char *);
+#if defined(WIN32)
+ /* As we currently can't pass glob patterns via the Windows
+ CLI, fall back to sub-string search. */
+ pattern = apr_psprintf(subpool, "*%s*", pattern);
+#endif
+ APR_ARRAY_PUSH(patterns, const char *) = pattern;
}
}
Modified: subversion/branches/1.10.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/svn.c?rev=1820250&r1=1820249&r2=1820250&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.10.x/subversion/svn/svn.c Fri Jan 5 04:00:16 2018
@@ -806,7 +806,34 @@ const svn_opt_subcommand_desc2_t svn_cl_
opt_changelist, opt_include_externals, opt_show_item, opt_no_newline}
},
- { "list", svn_cl__list, {"ls"}, N_
+ { "list", svn_cl__list, {"ls"},
+#if defined(WIN32)
+ N_
+ ("List directory entries in the repository.\n"
+ "usage: list [TARGET[@REV]...]\n"
+ "\n"
+ " List each TARGET file and the contents of each TARGET directory as\n"
+ " they exist in the repository. If TARGET is a working copy path, the\n"
+ " corresponding repository URL will be used. If specified, REV
determines\n"
+ " in which revision the target is first looked up.\n"
+ "\n"
+ " The default TARGET is '.', meaning the repository URL of the current\n"
+ " working directory.\n"
+ "\n"
+ " Multiple --search patterns may be specified and the output will be\n"
+ " reduced to those paths whose last segment - i.e. the file or
directory\n"
+ " name - contains a sub-string matching at least one of these patterns\n"
+ " (Windows only).\n"
+ "\n"
+ " With --verbose, the following fields will be shown for each item:\n"
+ "\n"
+ " Revision number of the last commit\n"
+ " Author of the last commit\n"
+ " 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"),
+#else
+ N_
("List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
"\n"
@@ -829,6 +856,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"),
+#endif
{'r', 'v', 'R', opt_depth, opt_incremental, opt_xml,
opt_include_externals, opt_search}, },
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/basic_tests.py?rev=1820250&r1=1820249&r2=1820250&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/basic_tests.py
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/basic_tests.py Fri Jan
5 04:00:16 2018
@@ -3114,7 +3114,7 @@ def plaintext_password_storage_disabled(
f.close()
-
+@Skip(svntest.main.is_os_windows)
def filtered_ls(sbox):
"filtered 'svn ls'"
