Log
[[[
Make 'svn resolve' verify that none of its targets are URLs.
* subversion/libsvn_client/resolved.c,
subversion/svn/resolve-cmd.c
(svn_client_resolve, svn_cl__resolve): Raise an error if any targets
look like URLs.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_resolve_targets, test_list): New test.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
]]]
Thanks and Regards
Noorul
Index: subversion/tests/cmdline/input_validation_tests.py
===================================================================
--- subversion/tests/cmdline/input_validation_tests.py (revision 1030477)
+++ subversion/tests/cmdline/input_validation_tests.py (working copy)
@@ -173,6 +173,12 @@
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'upgrade',
target, target)
+def invalid_resolve_targets(sbox):
+ "non-working copy paths for 'resolve'"
+ 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", 'resolve',
+ '--accept', 'base', target)
########################################################################
# Run the tests
@@ -192,6 +198,7 @@
invalid_log_targets,
invalid_merge_args,
invalid_wcpath_upgrade,
+ invalid_resolve_targets,
]
if __name__ == '__main__':
Index: subversion/svn/resolve-cmd.c
===================================================================
--- subversion/svn/resolve-cmd.c (revision 1030477)
+++ subversion/svn/resolve-cmd.c (working copy)
@@ -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"
@@ -93,13 +94,26 @@
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
+ /* Don't even attempt to modify the working copy if any of the
+ * targets look like URLs. 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++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
- err = svn_client_resolve(target,
+ err = svn_client_resolve(svn_dirent_canonicalize(target, iterpool),
opt_state->depth, conflict_choice,
ctx,
iterpool);
Index: subversion/libsvn_client/resolved.c
===================================================================
--- subversion/libsvn_client/resolved.c (revision 1030477)
+++ subversion/libsvn_client/resolved.c (working copy)
@@ -36,6 +36,7 @@
#include "client.h"
#include "private/svn_wc_private.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -48,6 +49,11 @@
{
const char *local_abspath;
+ 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));
+
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(svn_wc_resolved_conflict5(ctx->wc_ctx, local_abspath,
Received on 2010-11-03 17:06:14 CET