You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/06/08 23:06:08 UTC
svn commit: r952817 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_client/delete.c subversion/tests/cmdline/basic_tests.py
Author: hwright
Date: Tue Jun 8 21:06:08 2010
New Revision: 952817
URL: http://svn.apache.org/viewvc?rev=952817&view=rev
Log:
Reintegrate the 1.6.x-r935996 branch to 1.6.x:
* r935992, r935996 (issue #3636)
Makes it possible to delete paths directly from the repository that contain
characters that need escaping in an uri.
Justification:
svn rm URL should just work on 'http://server/path/with%20space'
Notes: r935992 is a test for this issue and r935996 fixes the issue and
extends the testcase a bit.
Branch:
^/subversion/branches/1.6.x-r935996.
Votes:
+1 rhuijben, steveking, pburba
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_client/delete.c
subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 21:06:08 2010
@@ -38,6 +38,7 @@
/subversion/branches/1.6.x-r923389:927445-929628
/subversion/branches/1.6.x-r926151:927922-929631
/subversion/branches/1.6.x-r933299:933310-934492
+/subversion/branches/1.6.x-r935996:936212-952816
/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
/subversion/branches/1.6.x-wc-ng-error:929379-929636
/subversion/branches/bdb-reverse-deltas:872050-872529
@@ -70,4 +71,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,87756
5,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879954,
879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,937610,944635
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,87756
5,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879954,
879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,935992,935996,937610,944635
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 21:06:08 2010
@@ -38,6 +38,7 @@
/subversion/branches/1.6.x-r923389/CHANGES:927445-929628
/subversion/branches/1.6.x-r926151/CHANGES:927922-929631
/subversion/branches/1.6.x-r933299/CHANGES:933310-934492
+/subversion/branches/1.6.x-r935996/CHANGES:936212-952816
/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
/subversion/branches/1.6.x-wc-ng-error/CHANGES:929379-929636
/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
@@ -69,4 +70,4 @@
/subversion/branches/tc_url_rev/CHANGES:874351-874483
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-934485,937610,944635
+/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=952817&r1=952816&r2=952817&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Jun 8 21:06:08 2010
@@ -294,15 +294,3 @@ Approved changes:
+1: rhuijben, steveking, lgo
+0: pburba - I don't have a Vista or Win7 box to try this out on, but it
works fine on my XP box.
-
- * r935992, r935996 (issue #3636)
- Makes it possible to delete paths directly from the repository that contain
- characters that need escaping in an uri.
- Justification:
- svn rm URL should just work on 'http://server/path/with%20space'
- Notes: r935992 is a test for this issue and r935996 fixes the issue and
- extends the testcase a bit.
- Branch:
- ^/subversion/branches/1.6.x-r935996.
- Votes:
- +1 rhuijben, steveking, pburba
Modified: subversion/branches/1.6.x/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_client/delete.c?rev=952817&r1=952816&r2=952817&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_client/delete.c Tue Jun 8 21:06:08 2010
@@ -128,7 +128,7 @@ delete_urls(svn_commit_info_t **commit_i
{
const char *bname;
svn_path_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/branches/1.6.x/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py?rev=952817&r1=952816&r2=952817&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py Tue Jun 8 21:06:08 2010
@@ -2452,6 +2452,31 @@ def basic_add_svn_format_file(sbox):
svntest.actions.run_and_verify_status(wc_dir, output)
+def delete_from_url_with_spaces(sbox):
+ "delete a directory with ' ' using its url"
+
+ sbox.build()
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir',
+ os.path.join(sbox.wc_dir,
+ 'Dir With Spaces'))
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', '--parents',
+ 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 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')
+
#----------------------------------------------------------------------
########################################################################
@@ -2507,6 +2532,7 @@ test_list = [ None,
basic_relative_url_with_peg_revisions,
basic_auth_test,
basic_add_svn_format_file,
+ delete_from_url_with_spaces,
]
if __name__ == '__main__':