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

[rh...@apache.org]

Author: rhuijben
Date: Tue Apr 20 17:09:18 2010
New Revision: 935996

URL: http://svn.apache.org/viewvc?rev=935996&view=rev
Log:
Fix the escaping issue in the last part of an url on delete I uncovered
in r935992.

* subversion/libsvn_client/delete.c
  (delete_urls): Decode an uri part when using it as a relative path.

* subversion/tests/cmdline/basic_tests.py
  (delete_from_url_with_spaces): Extend the test to also check a space
    in an earlier part of the url.
  (test_list): Remove XFail marking from delete_from_url_with_spaces.

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=935996&r1=935995&r2=935996&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Tue Apr 20 17:09:18 2010
@@ -160,7 +160,7 @@ delete_urls(svn_commit_info_t **commit_i
     {
       const char *bname;
       svn_uri_split(common, &common, &bname, pool);
-      APR_ARRAY_PUSH(targets, const char *) = bname;
+      APR_ARRAY_PUSH(targets, const char *) = svn_path_uri_decode(bname, pool);
     }
 
   /* Create new commit items and add them to the array. */

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=935996&r1=935995&r2=935996&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Tue Apr 20 17:09:18 2010
@@ -2483,15 +2483,21 @@ def delete_from_url_with_spaces(sbox):
   
   sbox.build()
   sbox.simple_mkdir(os.path.join(sbox.wc_dir, 'Dir With Spaces'))
+  sbox.simple_mkdir(os.path.join(sbox.wc_dir, 'Dir With'))
+  sbox.simple_mkdir(os.path.join(sbox.wc_dir, 'Dir With/Spaces'))
 
   svntest.actions.run_and_verify_svn(None, None, [],
                                       'ci', sbox.wc_dir, '-m', 'Added dir')
   
-  # This fails on 1.6.11 and trunk with an escaping error.
+  # This fails on 1.6.11 with an escaping error.
   svntest.actions.run_and_verify_svn(None, None, [],
                                       'rm', sbox.repo_url + '/Dir%20With%20Spaces',
                                       '-m', 'Deleted')
 
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                      'rm', sbox.repo_url + '/Dir%20With/Spaces',
+                                      '-m', 'Deleted')
+
 #----------------------------------------------------------------------
 
 ########################################################################
@@ -2548,7 +2554,7 @@ test_list = [ None,
               basic_auth_test,
               basic_add_svn_format_file,
               basic_mkdir_mix_targets,
-              XFail(delete_from_url_with_spaces),
+              delete_from_url_with_spaces,
              ]
 
 if __name__ == '__main__':