svn commit: r1030289 - in /subversion/trunk/subversion: libsvn_client/delete.c tests/cmdline/basic_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Nov  2 23:39:47 2010
New Revision: 1030289

URL: http://svn.apache.org/viewvc?rev=1030289&view=rev
Log:
Fix a url escaping issue in delete of urls uncovered in
http://svn.haxx.se/dev/archive-2010-11/0045.shtml

* subversion/libsvn_client/delete.c
  (delete_urls): Don't uri unescape the last part of a single target and
    don't escape all separate paths in the list of target.

* subversion/tests/cmdline/basic_tests.py
  (test_list): Remove XFail marking from delete_urls_with_spaces.

Found by: steveking

Modified:
    subversion/trunk/subversion/libsvn_client/delete.c
    subversion/trunk/subversion/tests/cmdline/basic_tests.py

Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1030289&r1=1030288&r2=1030289&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Tue Nov  2 23:39:47 2010
@@ -162,7 +162,7 @@ delete_urls(const apr_array_header_t *pa
     {
       const char *bname;
       svn_uri_split(&common, &bname, common, pool);
-      APR_ARRAY_PUSH(targets, const char *) = svn_path_uri_decode(bname, pool);
+      APR_ARRAY_PUSH(targets, const char *) = bname;
     }
 
   /* Create new commit items and add them to the array. */
@@ -206,7 +206,7 @@ delete_urls(const apr_array_header_t *pa
       const char *item_url;
 
       svn_pool_clear(subpool);
-      item_url = svn_path_url_add_component2(common, path, subpool);
+      item_url = svn_uri_join(common, path, subpool);
       path = svn_path_uri_decode(path, pool);
       APR_ARRAY_IDX(targets, i, const char *) = path;
 

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1030289&r1=1030288&r2=1030289&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Tue Nov  2 23:39:47 2010
@@ -2731,7 +2731,7 @@ test_list = [ None,
               delete_and_add_same_file,
               delete_child_parent_update,
               basic_relocate,
-              XFail(delete_urls_with_spaces),
+              delete_urls_with_spaces,
              ]
 
 if __name__ == '__main__':