On Wed, Sep 26, 2012 at 3:40 PM, C. Michael Pilato <cmpil...@collab.net>wrote:
> On 09/26/2012 08:47 AM, stef...@apache.org wrote: > > Author: stefan2 > > Date: Wed Sep 26 12:47:23 2012 > > New Revision: 1390443 > > [...] > > > Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c > > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1390443&r1=1390442&r2=1390443&view=diff > > > ============================================================================== > > --- subversion/trunk/subversion/libsvn_ra_svn/client.c (original) > > +++ subversion/trunk/subversion/libsvn_ra_svn/client.c Wed Sep 26 > 12:47:23 2012 > > @@ -258,7 +258,7 @@ static svn_error_t *ra_svn_set_path(void > > { > > ra_svn_reporter_baton_t *b = baton; > > > > - SVN_ERR(svn_ra_svn_write_cmd(b->conn, pool, "set-path", "crb(?c)w", > > + SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, > svn_ra_svn_cmd_set_path, > > path, rev, start_empty, lock_token, > > svn_depth_to_word(depth))); > > Missed an indentation update here. > > > Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c > > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1390443&r1=1390442&r2=1390443&view=diff > > > ============================================================================== > > --- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original) > > +++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Sep 26 > 12:47:23 2012 > > @@ -127,7 +127,7 @@ static svn_error_t *check_for_error(ra_s > > if (svn_ra_svn__input_waiting(eb->conn, pool)) > > { > > eb->got_status = TRUE; > > - SVN_ERR(svn_ra_svn_write_cmd(eb->conn, pool, "abort-edit", "")); > > + SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, > svn_ra_svn_cmd_abort_edit)); > > SVN_ERR(svn_ra_svn_read_cmd_response(eb->conn, pool, "")); > > /* We shouldn't get here if the consumer is doing its job. */ > > return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL, > > @@ -142,7 +142,7 @@ static svn_error_t *ra_svn_target_rev(vo > > ra_svn_edit_baton_t *eb = edit_baton; > > > > SVN_ERR(check_for_error(eb, pool)); > > - SVN_ERR(svn_ra_svn_write_cmd(eb->conn, pool, "target-rev", "r", rev)); > > + SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, > svn_ra_svn_cmd_target_rev, rev)); > > return SVN_NO_ERROR; > > } > > > > @@ -153,7 +153,7 @@ static svn_error_t *ra_svn_open_root(voi > > const char *token = make_token('d', eb, pool); > > > > SVN_ERR(check_for_error(eb, pool)); > > - SVN_ERR(svn_ra_svn_write_cmd(eb->conn, pool, "open-root", "(?r)c", > rev, > > + SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, > svn_ra_svn_cmd_open_root, rev, > > token)); > > ...and here (and lots of places in this file, actually). > Fixed in r1390570. Thanks for the review! -- Stefan^2. -- * Join us this October at Subversion Live 2012<http://www.wandisco.com/svn-live-2012> for two days of best practice SVN training, networking, live demos, committer meet and greet, and more! Space is limited, so get signed up today<http://www.wandisco.com/svn-live-2012> ! *