You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/11/03 19:23:11 UTC
svn commit: r1030596 - in /subversion/trunk/subversion: svn/resolved-cmd.c
tests/cmdline/input_validation_tests.py
Author: stsp
Date: Wed Nov 3 18:23:11 2010
New Revision: 1030596
URL: http://svn.apache.org/viewvc?rev=1030596&view=rev
Log:
Make 'svn resolved' verify that none of its targets are URLs.
* subversion/svn/resolved-cmd.c
(svn_cl__resolved): Raise an error if any targets look like URLs.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_resolved_targets, test_list): New test.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
Modified:
subversion/trunk/subversion/svn/resolved-cmd.c
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
Modified: subversion/trunk/subversion/svn/resolved-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolved-cmd.c?rev=1030596&r1=1030595&r2=1030596&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolved-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolved-cmd.c Wed Nov 3 18:23:11 2010
@@ -29,6 +29,7 @@
#define APR_WANT_STDIO
#include <apr_want.h>
+#include "svn_path.h"
#include "svn_client.h"
#include "svn_error.h"
#include "svn_pools.h"
@@ -64,6 +65,18 @@ svn_cl__resolved(apr_getopt_t *os,
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
+ /* URLs are invalid input. */
+ for (i = 0; i < targets->nelts; i++)
+ {
+ const char *target = APR_ARRAY_IDX(targets, i, const char *);
+
+ if (svn_path_is_url(target))
+ return svn_error_return(svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR,
+ NULL,
+ _("'%s' is not a local path"),
+ target));
+ }
+
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < targets->nelts; i++)
{
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=1030596&r1=1030595&r2=1030596&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Wed Nov 3 18:23:11 2010
@@ -180,6 +180,13 @@ def invalid_resolve_targets(sbox):
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'resolve',
'--accept', 'base', target)
+def invalid_resolved_targets(sbox):
+ "non-working copy paths for 'resolved'"
+ sbox.build(read_only=True)
+ for target in _invalid_wc_path_targets:
+ run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'resolved',
+ target)
+
########################################################################
# Run the tests
@@ -199,6 +206,7 @@ test_list = [ None,
invalid_merge_args,
invalid_wcpath_upgrade,
invalid_resolve_targets,
+ invalid_resolved_targets,
]
if __name__ == '__main__':