You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/04/12 18:34:40 UTC
svn commit: r933311 - in /subversion/branches/1.6.x-r933299: ./ CHANGES
subversion/libsvn_client/update.c subversion/tests/cmdline/authz_tests.py
Author: cmpilato
Date: Mon Apr 12 16:34:39 2010
New Revision: 933311
URL: http://svn.apache.org/viewvc?rev=933311&view=rev
Log:
On the '1.6.x-r933299' branch, merge from trunk (with conflict
resolution) r933299 (which see for details).
Modified:
subversion/branches/1.6.x-r933299/ (props changed)
subversion/branches/1.6.x-r933299/CHANGES (props changed)
subversion/branches/1.6.x-r933299/subversion/libsvn_client/update.c
subversion/branches/1.6.x-r933299/subversion/tests/cmdline/authz_tests.py
Propchange: subversion/branches/1.6.x-r933299/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 12 16:34:39 2010
@@ -69,4 +69,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,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,877565,87756
8,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
+/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,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,877565,87756
8,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,933299
Propchange: subversion/branches/1.6.x-r933299/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 12 16:34:39 2010
@@ -68,4 +68,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-929658,931209,931211,931392,931568
+/subversion/trunk/CHANGES:837701-841355,875962-929658,931209,931211,931392,931568,933299
Modified: subversion/branches/1.6.x-r933299/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r933299/subversion/libsvn_client/update.c?rev=933311&r1=933310&r2=933311&view=diff
==============================================================================
--- subversion/branches/1.6.x-r933299/subversion/libsvn_client/update.c (original)
+++ subversion/branches/1.6.x-r933299/subversion/libsvn_client/update.c Mon Apr 12 16:34:39 2010
@@ -44,7 +44,7 @@
struct ff_baton
{
svn_client_ctx_t *ctx; /* client context used to open ra session */
- const char *repos_root; /* the root of the ra session */
+ const char *repos_root; /* repository root URL */
svn_ra_session_t *session; /* the secondary ra session itself */
apr_pool_t *pool; /* the pool where the ra session is allocated */
};
@@ -63,14 +63,22 @@ file_fetcher(void *baton,
apr_pool_t *pool)
{
struct ff_baton *ffb = (struct ff_baton *)baton;
+ const char *dirpath, *base_name, *session_url, *old_session_url;
- if (! ffb->session)
- SVN_ERR(svn_client__open_ra_session_internal(&(ffb->session),
- ffb->repos_root,
+ svn_path_split(path, &dirpath, &base_name, pool);
+ session_url = svn_path_url_add_component2(ffb->repos_root,
+ dirpath, pool);
+
+ if (ffb->session)
+ SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url, ffb->session,
+ session_url, ffb->pool));
+ else
+ SVN_ERR(svn_client__open_ra_session_internal(&(ffb->session), session_url,
NULL, NULL, NULL,
FALSE, TRUE,
ffb->ctx, ffb->pool));
- return svn_ra_get_file(ffb->session, path, revision, stream,
+
+ return svn_ra_get_file(ffb->session, base_name, revision, stream,
fetched_rev, props, pool);
}
Modified: subversion/branches/1.6.x-r933299/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r933299/subversion/tests/cmdline/authz_tests.py?rev=933311&r1=933310&r2=933311&view=diff
==============================================================================
--- subversion/branches/1.6.x-r933299/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/branches/1.6.x-r933299/subversion/tests/cmdline/authz_tests.py Mon Apr 12 16:34:39 2010
@@ -822,6 +822,44 @@ def authz_switch_to_directory(sbox):
# Switch /A/B/E to /A/B/F.
svntest.main.run_svn(None, 'switch', sbox.repo_url + "/A/B/E", G_path)
+
+def authz_access_required_at_repo_root2(sbox):
+ "more authz issue #3242 - update to renamed file"
+
+ sbox.build(create_wc = False)
+ root_url = sbox.repo_url
+
+ # Now we get all restrictive.
+ write_authz_file(sbox, {'/': '* =',
+ '/A': 'jrandom = rw'})
+ write_restrictive_svnserve_conf(sbox.repo_dir)
+
+ # Rename a file.
+ svntest.main.run_svn(None, 'mv',
+ '-m', 'rename file in readable writable space',
+ root_url + '/A/B/E/alpha',
+ root_url + '/A/B/E/alpha-renamed')
+
+ # Check out original greek sub tree below /A/B/E
+ # and update it to the above rename.
+ wc_dir = sbox.add_wc_path('ABE')
+ os.mkdir(wc_dir)
+ svntest.main.run_svn(None, 'co', '-r', '1', root_url + '/A/B/E', wc_dir)
+ svntest.main.run_svn(None, 'up', wc_dir)
+
+ # Rename a directory.
+ svntest.main.run_svn(None, 'mv',
+ '-m', 'rename diretory in readable writable space',
+ root_url + '/A/D/H',
+ root_url + '/A/D/a g e')
+
+ # Check out original greek sub tree below /A/D
+ # and update it to the above rename.
+ wc_dir = sbox.add_wc_path('AD')
+ os.mkdir(wc_dir)
+ svntest.main.run_svn(None, 'co', '-r', '1', root_url + '/A/D', wc_dir)
+ svntest.main.run_svn(None, 'up', wc_dir)
+
########################################################################
# Run the tests
@@ -845,6 +883,8 @@ test_list = [ None,
svntest.main.is_ra_type_svn)),
XFail(Skip(authz_switch_to_directory,
svntest.main.is_ra_type_file)),
+ Skip(authz_access_required_at_repo_root2,
+ svntest.main.is_ra_type_file),
]
if __name__ == '__main__':