Author: danielsh
Date: Thu Jun 24 15:52:26 2010
New Revision: 957587
URL: http://svn.apache.org/viewvc?rev=957587&view=rev
Log:
Follow-up to r957094: ra_svn tweaks.
* subversion/libsvn_ra_svn/protocol
(get-locks):
Document the extended syntax.
* subversion/libsvn_ra_svn/client.c
(ra_svn_get_locks):
Send the new 'depth' argument in its own tuple.
* subversion/svnserve/serve.c
(get_locks):
Expect the new 'depth' argument in its own tuple, or omitted entirely.
Modified:
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/protocol
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=957587&r1=957586&r2=957587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Jun 24 15:52:26 2010
@@ -2225,7 +2225,7 @@ static svn_error_t *ra_svn_get_locks(svn
abs_path, pool));
abs_path = apr_pstrcat(pool, "/", abs_path, NULL);
- SVN_ERR(svn_ra_svn_write_cmd(conn, pool, "get-locks", "c?w", path,
+ SVN_ERR(svn_ra_svn_write_cmd(conn, pool, "get-locks", "c(w)", path,
svn_depth_to_word(depth)));
/* Servers before 1.2 doesn't support locking. Check this here. */
Modified: subversion/trunk/subversion/libsvn_ra_svn/protocol
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/protocol?rev=957587&r1=957586&r2=957587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/protocol (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/protocol Thu Jun 24 15:52:26 2010
@@ -427,7 +427,7 @@ second place for auth-request point as n
response: ( [ lock:lockdesc ] )
get-locks
- params: ( path:string )
+ params: ( path:string [ depth:word ] )
response ( ( lock:lockdesc ... ) )
replay
Modified: subversion/trunk/subversion/svnserve/serve.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=957587&r1=957586&r2=957587&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Thu Jun 24 15:52:26 2010
@@ -2577,7 +2577,7 @@ static svn_error_t *get_locks(svn_ra_svn
apr_hash_t *locks;
apr_hash_index_t *hi;
- SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?w", &path, &depth_word));
+ SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?(?w)", &path, &depth_word));
depth = depth_word ? svn_depth_from_word(depth_word) : svn_depth_infinity;
full_path = svn_uri_join(b->fs_path->data,
