Author: julianfoad
Date: Thu Nov 18 09:46:38 2010
New Revision: 1036373
URL: http://svn.apache.org/viewvc?rev=1036373&view=rev
Log:
Make 'svn switch' verify that the target path is local. Part of issue #3620.
* subversion/libsvn_client/switch.c,
subversion/svn/switch-cmd.c
(svn_client_switch2, svn_cl__switch): Raise an error if target path is
not local.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_switch_targets, test_list): New test.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
(tweaked by me)
Modified:
subversion/trunk/subversion/libsvn_client/switch.c
subversion/trunk/subversion/svn/switch-cmd.c
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1036373&r1=1036372&r2=1036373&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Thu Nov 18 09:46:38 2010
@@ -329,6 +329,11 @@ svn_client_switch2(svn_revnum_t *result_
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
+ if (svn_path_is_url(path))
+ return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("'%s' is not a local path"),
+ path);
+
return svn_client__switch_internal(result_rev, path, switch_url,
peg_revision, revision, depth,
depth_is_sticky, NULL, ignore_externals,
Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=1036373&r1=1036372&r2=1036373&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Thu Nov 18 09:46:38 2010
@@ -144,6 +144,12 @@ svn_cl__switch(apr_getopt_t *os,
(SVN_ERR_BAD_URL, NULL,
_("'%s' does not appear to be a URL"), switch_url);
+ /* Target path cannot be URL */
+ if (svn_path_is_url(target))
+ return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("'%s' is not a local path"),
+ target);
+
/* Canonicalize the URL. */
switch_url = svn_uri_canonicalize(switch_url, scratch_pool);
Modified: subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/input_validation_tests.py?rev=1036373&r1=1036372&r2=1036373&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Thu Nov
18 09:46:38 2010
@@ -222,6 +222,12 @@ def invalid_patch_targets(sbox):
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'patch',
target1, target2)
+def invalid_switch_targets(sbox):
+ "non-working copy paths for 'switch'"
+ sbox.build(read_only=True)
+ run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'switch',
+ "^/", "^/")
+
########################################################################
# Run the tests
@@ -247,6 +253,7 @@ test_list = [ None,
invalid_unlock_targets,
invalid_status_targets,
invalid_patch_targets,
+ invalid_switch_targets,
]
if __name__ == '__main__':
