svn commit: r13184 - branches/locking/subversion/svnserve

Author: lundblad
Date: Sun Feb 27 16:11:54 2005
New Revision: 13184

Modified:
   branches/locking/subversion/svnserve/serve.c
Log:
Locking branch: Implement svnserve part of new reporter.

* subversion/svnserve/serve.c (set_path, link_path): Read lock token from
  client and forward to repository call.


Modified: branches/locking/subversion/svnserve/serve.c
Url: 
http://svn.collab.net/viewcvs/svn/branches/locking/subversion/svnserve/serve.c?view=diff&rev=13184&p1=branches/locking/subversion/svnserve/serve.c&r1=13183&p2=branches/locking/subversion/svnserve/serve.c&r2=13184
==============================================================================
--- branches/locking/subversion/svnserve/serve.c        (original)
+++ branches/locking/subversion/svnserve/serve.c        Sun Feb 27 16:11:54 2005
@@ -269,15 +269,16 @@
                              apr_array_header_t *params, void *baton)
 {
   report_driver_baton_t *b = baton;
-  const char *path;
+  const char *path, *lock_token;
   svn_revnum_t rev;
   svn_boolean_t start_empty;
 
-  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "crb",
-                                 &path, &rev, &start_empty));
+  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "crb?(?c)",
+                                 &path, &rev, &start_empty, &lock_token));
   path = svn_path_canonicalize(path, pool);
   if (!b->err)
-    b->err = svn_repos_set_path(b->report_baton, path, rev, start_empty, pool);
+    b->err = svn_repos_set_path2(b->report_baton, path, rev, start_empty,
+                                 lock_token, pool);
   return SVN_NO_ERROR;
 }
 
@@ -298,19 +299,20 @@
                               apr_array_header_t *params, void *baton)
 {
   report_driver_baton_t *b = baton;
-  const char *path, *url, *fs_path;
+  const char *path, *url, *lock_token, *fs_path;
   svn_revnum_t rev;
   svn_boolean_t start_empty;
 
-  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "ccrb",
-                                 &path, &url, &rev, &start_empty));
+  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "ccrb?(?c)",
+                                 &path, &url, &rev, &start_empty,
+                                 &lock_token));
   path = svn_path_canonicalize(path, pool);
   url = svn_path_uri_decode(svn_path_canonicalize(url, pool), pool);
   if (!b->err)
     b->err = get_fs_path(b->repos_url, url, &fs_path, pool);
   if (!b->err)
-    b->err = svn_repos_link_path(b->report_baton, path, fs_path, rev,
-                                 start_empty, pool);
+    b->err = svn_repos_link_path2(b->report_baton, path, fs_path, rev,
+                                  start_empty, lock_token, pool);
   return SVN_NO_ERROR;
 }