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/04 20:08:03 UTC
svn commit: r1031160 - in /subversion/trunk/subversion:
libsvn_client/status.c svn/status-cmd.c
tests/cmdline/input_validation_tests.py
Author: stsp
Date: Thu Nov 4 19:08:02 2010
New Revision: 1031160
URL: http://svn.apache.org/viewvc?rev=1031160&view=rev
Log:
Make 'svn status' verify that none of its targets are URLs.
* subversion/libsvn_client/status.c,
subversion/svn/status-cmd.c
(svn_client_status5, svn_cl__status): Raise an error if any targets
look like URLs.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_status_targets, test_list): New test.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
Modified:
subversion/trunk/subversion/libsvn_client/status.c
subversion/trunk/subversion/svn/status-cmd.c
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1031160&r1=1031159&r2=1031160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Nov 4 19:08:02 2010
@@ -32,6 +32,7 @@
#include "svn_pools.h"
#include "client.h"
+#include "svn_path.h"
#include "svn_dirent_uri.h"
#include "svn_delta.h"
#include "svn_client.h"
@@ -268,6 +269,11 @@ svn_client_status5(svn_revnum_t *result_
apr_hash_t *changelist_hash = NULL;
struct svn_cl__externals_store externals_store = { NULL };
+ if (svn_path_is_url(path))
+ return svn_error_return(svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("'%s' is not a local path"),
+ path));
+
if (changelists && changelists->nelts)
SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelists, pool));
Modified: subversion/trunk/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=1031160&r1=1031159&r2=1031160&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Thu Nov 4 19:08:02 2010
@@ -249,6 +249,18 @@ svn_cl__status(apr_getopt_t *os,
/* Add "." if user passed 0 arguments */
svn_opt_push_implicit_dot_target(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));
+ }
+
/* We want our -u statuses to be against HEAD. */
rev.kind = svn_opt_revision_head;
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=1031160&r1=1031159&r2=1031160&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Thu Nov 4 19:08:02 2010
@@ -201,6 +201,13 @@ def invalid_lock_targets(sbox):
run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
"copy targets", 'lock', target1, target2)
+def invalid_status_targets(sbox):
+ "non-working copy paths for 'status'"
+ 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", 'status',
+ target)
+
########################################################################
# Run the tests
@@ -223,6 +230,7 @@ test_list = [ None,
invalid_resolved_targets,
invalid_revert_targets,
invalid_lock_targets,
+ invalid_status_targets,
]
if __name__ == '__main__':