Author: stefan2
Date: Sat Oct 20 16:00:46 2012
New Revision: 1400482
URL: http://svn.apache.org/viewvc?rev=1400482&view=rev
Log:
Update to non-deprecated API: switch 2 calls from free-form
ra_svn commands to templated commands.
* subversion/include/svn_ra_svn.h
(svn_ra_svn_cmd_t): define new commands
* subversion/libsvn_ra_svn/marshal.c
(vwrite_cmd_get_iprops): new command template
(cmd_template): add entries for new commands
* subversion/libsvn_ra_svn/client.c
(ra_svn_get_inherited_props): use templated ra_svn command
* subversion/svnserve/serve.c
(replay_one_revision): ditto
Modified:
subversion/trunk/subversion/include/svn_ra_svn.h
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/include/svn_ra_svn.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra_svn.h?rev=1400482&r1=1400481&r2=1400482&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra_svn.h (original)
+++ subversion/trunk/subversion/include/svn_ra_svn.h Sat Oct 20 16:00:46 2012
@@ -215,6 +215,8 @@ typedef enum svn_ra_svn_cmd_t
svn_ra_svn_cmd_replay,
svn_ra_svn_cmd_replay_range,
svn_ra_svn_cmd_get_deleted_rev,
+ svn_ra_svn_cmd_get_iprops,
+ svn_ra_svn_cmd_finish_replay,
svn_ra_svn_cmd__last
} svn_ra_svn_cmd_t;
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1400482&r1=1400481&r2=1400482&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Sat Oct 20 16:00:46 2012
@@ -2671,8 +2671,9 @@ ra_svn_get_inherited_props(svn_ra_sessio
svn_ra_svn_conn_t *conn = sess_baton->conn;
apr_array_header_t *iproplist;
- SVN_ERR(svn_ra_svn_write_cmd(conn, scratch_pool, "get-iprops", "c(?r)",
- path, revision));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(conn, scratch_pool,
+ svn_ra_svn_cmd_get_iprops,
+ path, revision));
SVN_ERR(handle_auth_request(sess_baton, scratch_pool));
SVN_ERR(svn_ra_svn_read_cmd_response(conn, scratch_pool, "l", &iproplist));
SVN_ERR(parse_iproplist(iprops, iproplist, session, result_pool,
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1400482&r1=1400481&r2=1400482&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Sat Oct 20 16:00:46 2012
@@ -1103,7 +1103,15 @@ vwrite_cmd_get_deleted_rev(svn_ra_svn_co
return SVN_NO_ERROR;
}
+static svn_error_t *
+vwrite_cmd_get_iprops(svn_ra_svn_conn_t *conn, apr_pool_t *pool, va_list *ap)
+{
+ SVN_ERR(vwrite_tuple_cstring(conn, pool, ap));
+ SVN_ERR(vwrite_tuple_revision_opt(conn, pool, ap));
+ return SVN_NO_ERROR;
+}
+
typedef svn_error_t *
(*vwrite_tuple_func)(svn_ra_svn_conn_t *, apr_pool_t *, va_list *);
@@ -1161,7 +1169,9 @@ static const cmd_template_t cmd_template
{"( get-locks ( " , 14, vwrite_cmd_get_locks },
{"( replay ( " , 11, vwrite_cmd_replay },
{"( replay-range ( " , 17, vwrite_cmd_replay_range },
- {"( get-deleted-rev ( " , 20, vwrite_cmd_get_deleted_rev }
+ {"( get-deleted-rev ( " , 20, vwrite_cmd_get_deleted_rev },
+ {"( get-iprops ( " , 15, vwrite_cmd_get_iprops },
+ {"( finish-replay ( " , 18, vwrite_cmd_no_op }
};
Modified: subversion/trunk/subversion/svnserve/serve.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1400482&r1=1400481&r2=1400482&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Sat Oct 20 16:00:46 2012
@@ -2841,7 +2841,8 @@ static svn_error_t *replay_one_revision(
svn_error_clear(editor->abort_edit(edit_baton, pool));
SVN_CMD_ERR(err);
- return svn_ra_svn_write_cmd(conn, pool, "finish-replay", "");
+ return svn_ra_svn_write_templated_cmd(conn, pool,
+ svn_ra_svn_cmd_finish_replay);
}
static svn_error_t *replay(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
