Author: julianfoad Date: Wed Jul 30 10:02:09 2014 New Revision: 1614599 URL: http://svn.apache.org/r1614599 Log: Move 'svn_client_mtcc.h' into the 'private' subdirectory, so we don't make it public in 1.9.
It's not considered stable enough in its current form. See the email thread "The new svn_client_mtcc API" started on 2014-07-29 by Julian Foad, archived at e.g. <http://svn.haxx.se/dev/archive-2014-07/0138.shtml>. * subversion/include/svn_client_mtcc.h Move ... * subversion/include/private/svn_client_mtcc.h ... to here, and rename all symbols: s/svn_client_mtcc/svn_client__mtcc/. * subversion/libsvn_client/mtcc.c, subversion/svnmucc/svnmucc.c, subversion/tests/libsvn_client/client-test.c, subversion/tests/libsvn_client/mtcc-test.c Adjust the '#include', and track the renamed symbols. Added: subversion/trunk/subversion/include/private/svn_client_mtcc.h - copied, changed from r1614389, subversion/trunk/subversion/include/svn_client_mtcc.h Removed: subversion/trunk/subversion/include/svn_client_mtcc.h Modified: subversion/trunk/subversion/libsvn_client/mtcc.c subversion/trunk/subversion/svnmucc/svnmucc.c subversion/trunk/subversion/tests/libsvn_client/client-test.c subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c Copied: subversion/trunk/subversion/include/private/svn_client_mtcc.h (from r1614389, subversion/trunk/subversion/include/svn_client_mtcc.h) URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_mtcc.h?p2=subversion/trunk/subversion/include/private/svn_client_mtcc.h&p1=subversion/trunk/subversion/include/svn_client_mtcc.h&r1=1614389&r2=1614599&rev=1614599&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_client_mtcc.h (original) +++ subversion/trunk/subversion/include/private/svn_client_mtcc.h Wed Jul 30 10:02:09 2014 @@ -49,11 +49,11 @@ extern "C" { /** This is a structure which stores a list of repository commands * that can be played to a repository as a single operation * - * Use svn_client_mtcc_create() to create instances + * Use svn_client__mtcc_create() to create instances * * @since New in 1.9. */ -typedef struct svn_client_mtcc_t svn_client_mtcc_t; +typedef struct svn_client__mtcc_t svn_client__mtcc_t; /** Creates a new multicommand context for an operation on @a anchor_url and * its descendants. @@ -64,12 +64,12 @@ typedef struct svn_client_mtcc_t svn_cli * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_create(svn_client_mtcc_t **mtcc, - const char *anchor_url, - svn_revnum_t base_revision, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); +svn_client__mtcc_create(svn_client__mtcc_t **mtcc, + const char *anchor_url, + svn_revnum_t base_revision, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); /** Adds a file add operation of @a relpath to @a mtcc. If @a src_checksum * is not null it will be provided to the repository to verify if the file @@ -83,11 +83,11 @@ svn_client_mtcc_create(svn_client_mtcc_t * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_add_file(const char *relpath, - svn_stream_t *src_stream, - const svn_checksum_t *src_checksum, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_add_file(const char *relpath, + svn_stream_t *src_stream, + const svn_checksum_t *src_checksum, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds a copy operation of the node @a src_relpath at revision @a revision * to @a dst_relpath to @a mtcc. @@ -97,11 +97,11 @@ svn_client_mtcc_add_add_file(const char * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_copy(const char *src_relpath, - svn_revnum_t revision, - const char *dst_relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_copy(const char *src_relpath, + svn_revnum_t revision, + const char *dst_relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds a delete of @a relpath to @a mtcc. * @@ -110,9 +110,9 @@ svn_client_mtcc_add_copy(const char *src * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_delete(const char *relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_delete(const char *relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds an mkdir operation of @a relpath to @a mtcc. * @@ -121,9 +121,9 @@ svn_client_mtcc_add_delete(const char *r * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_mkdir(const char *relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_mkdir(const char *relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds a move operation of the node @a src_relpath to @a dst_relpath to @@ -134,10 +134,10 @@ svn_client_mtcc_add_mkdir(const char *re * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_move(const char *src_relpath, - const char *dst_relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_move(const char *src_relpath, + const char *dst_relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds a propset operation for the property @a propname to @a propval * (which can be NULL for a delete) on @a relpath to @a mtcc. @@ -150,12 +150,12 @@ svn_client_mtcc_add_move(const char *src * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_propset(const char *relpath, - const char *propname, - const svn_string_t *propval, - svn_boolean_t skip_checks, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_propset(const char *relpath, + const char *propname, + const svn_string_t *propval, + svn_boolean_t skip_checks, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Adds an update file operation for @a relpath to @a mtcc. @@ -178,13 +178,13 @@ svn_client_mtcc_add_propset(const char * * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_add_update_file(const char *relpath, - svn_stream_t *src_stream, - const svn_checksum_t *src_checksum, - svn_stream_t *base_stream, - const svn_checksum_t *base_checksum, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_add_update_file(const char *relpath, + svn_stream_t *src_stream, + const svn_checksum_t *src_checksum, + svn_stream_t *base_stream, + const svn_checksum_t *base_checksum, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Obtains the kind of node at @a relpath in the current state of @a mtcc. * This value might be from the cache (in case of modifications, copies) @@ -198,11 +198,11 @@ svn_client_mtcc_add_update_file(const ch * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_check_path(svn_node_kind_t *kind, - const char *relpath, - svn_boolean_t check_repository, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_check_path(svn_node_kind_t *kind, + const char *relpath, + svn_boolean_t check_repository, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** Commits all operations stored in @a mtcc as a new revision and destroys * @a mtcc. @@ -210,11 +210,11 @@ svn_client_mtcc_check_path(svn_node_kind * @since New in 1.9. */ svn_error_t * -svn_client_mtcc_commit(apr_hash_t *revprop_table, - svn_commit_callback2_t commit_callback, - void *commit_baton, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool); +svn_client__mtcc_commit(apr_hash_t *revprop_table, + svn_commit_callback2_t commit_callback, + void *commit_baton, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool); /** @} end group: Multi Command Context related functions */ Modified: subversion/trunk/subversion/libsvn_client/mtcc.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mtcc.c?rev=1614599&r1=1614598&r2=1614599&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/mtcc.c (original) +++ subversion/trunk/subversion/libsvn_client/mtcc.c Wed Jul 30 10:02:09 2014 @@ -29,7 +29,7 @@ #include "svn_pools.h" #include "svn_subst.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "svn_private_config.h" @@ -40,22 +40,22 @@ #define SVN_PATH_IS_EMPTY(s) ((s)[0] == '\0') -/* The kind of operation to perform in an svn_client_mtcc_op_t */ -typedef enum svn_client_mtcc_kind_t +/* The kind of operation to perform in an mtcc_op_t */ +typedef enum mtcc_kind_t { OP_OPEN_DIR, OP_OPEN_FILE, OP_ADD_DIR, OP_ADD_FILE, OP_DELETE, -} svn_client_mtcc_kind_t; +} mtcc_kind_t; -typedef struct svn_client_mtcc_op_t +typedef struct mtcc_op_t { const char *name; /* basename of operation */ - svn_client_mtcc_kind_t kind; /* editor operation */ + mtcc_kind_t kind; /* editor operation */ - apr_array_header_t *children; /* List of svn_client_mtcc_op_t * */ + apr_array_header_t *children; /* List of mtcc_op_t * */ const char *src_relpath; /* For ADD_DIR, ADD_FILE */ svn_revnum_t src_rev; /* For ADD_DIR, ADD_FILE */ @@ -68,7 +68,7 @@ typedef struct svn_client_mtcc_op_t List of svn_prop_t */ svn_boolean_t performed_stat; /* Verified kind with repository */ -} svn_client_mtcc_op_t; +} mtcc_op_t; /* Check if the mtcc doesn't contain any modifications yet */ #define MTCC_UNMODIFIED(mtcc) \ @@ -79,7 +79,7 @@ typedef struct svn_client_mtcc_op_t && (mtcc->root_op->children == NULL \ || !mtcc->root_op->children->nelts)) -struct svn_client_mtcc_t +struct svn_client__mtcc_t { apr_pool_t *pool; svn_revnum_t head_revision; @@ -88,16 +88,16 @@ struct svn_client_mtcc_t svn_ra_session_t *ra_session; svn_client_ctx_t *ctx; - svn_client_mtcc_op_t *root_op; + mtcc_op_t *root_op; }; -static svn_client_mtcc_op_t * +static mtcc_op_t * mtcc_op_create(const char *name, svn_boolean_t add, svn_boolean_t directory, apr_pool_t *result_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; op = apr_pcalloc(result_pool, sizeof(*op)); op->name = name ? apr_pstrdup(result_pool, name) : ""; @@ -108,8 +108,7 @@ mtcc_op_create(const char *name, op->kind = directory ? OP_OPEN_DIR : OP_OPEN_FILE; if (directory) - op->children = apr_array_make(result_pool, 4, - sizeof(svn_client_mtcc_op_t *)); + op->children = apr_array_make(result_pool, 4, sizeof(mtcc_op_t *)); op->src_rev = SVN_INVALID_REVNUM; @@ -117,10 +116,10 @@ mtcc_op_create(const char *name, } static svn_error_t * -mtcc_op_find(svn_client_mtcc_op_t **op, +mtcc_op_find(mtcc_op_t **op, svn_boolean_t *created, const char *relpath, - svn_client_mtcc_op_t *base_op, + mtcc_op_t *base_op, svn_boolean_t find_existing, svn_boolean_t find_deletes, svn_boolean_t create_file, @@ -171,9 +170,9 @@ mtcc_op_find(svn_client_mtcc_op_t **op, for (i = base_op->children->nelts-1; i >= 0 ; i--) { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; - cop = APR_ARRAY_IDX(base_op->children, i, svn_client_mtcc_op_t *); + cop = APR_ARRAY_IDX(base_op->children, i, mtcc_op_t *); if (! strcmp(cop->name, name) && (find_deletes || cop->kind != OP_DELETE)) @@ -192,11 +191,11 @@ mtcc_op_find(svn_client_mtcc_op_t **op, } { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; cop = mtcc_op_create(name, FALSE, child || !create_file, result_pool); - APR_ARRAY_PUSH(base_op->children, svn_client_mtcc_op_t *) = cop; + APR_ARRAY_PUSH(base_op->children, mtcc_op_t *) = cop; if (!child) { @@ -218,7 +217,7 @@ static svn_error_t * get_origin(svn_boolean_t *done, const char **origin_relpath, svn_revnum_t *rev, - svn_client_mtcc_op_t *op, + mtcc_op_t *op, const char *relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) @@ -251,9 +250,9 @@ get_origin(svn_boolean_t *done, for (i = op->children->nelts-1; i >= 0; i--) { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; - cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *); + cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *); if (! strcmp(cop->name, name)) { @@ -297,7 +296,7 @@ mtcc_get_origin(const char **origin_relp svn_revnum_t *rev, const char *relpath, svn_boolean_t ignore_enoent, - svn_client_mtcc_t *mtcc, + svn_client__mtcc_t *mtcc, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { @@ -325,12 +324,12 @@ mtcc_get_origin(const char **origin_relp } svn_error_t * -svn_client_mtcc_create(svn_client_mtcc_t **mtcc, - const char *anchor_url, - svn_revnum_t base_revision, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +svn_client__mtcc_create(svn_client__mtcc_t **mtcc, + const char *anchor_url, + svn_revnum_t base_revision, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { apr_pool_t *mtcc_pool; @@ -362,7 +361,7 @@ svn_client_mtcc_create(svn_client_mtcc_t } static svn_error_t * -update_copy_src(svn_client_mtcc_op_t *op, +update_copy_src(mtcc_op_t *op, const char *add_relpath, apr_pool_t *result_pool) { @@ -377,9 +376,9 @@ update_copy_src(svn_client_mtcc_op_t *op for (i = 0; i < op->children->nelts; i++) { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; - cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *); + cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *); SVN_ERR(update_copy_src(cop, add_relpath, result_pool)); } @@ -389,7 +388,7 @@ update_copy_src(svn_client_mtcc_op_t *op static svn_error_t * mtcc_reparent(const char *new_anchor_url, - svn_client_mtcc_t *mtcc, + svn_client__mtcc_t *mtcc, apr_pool_t *scratch_pool) { const char *session_url; @@ -419,15 +418,14 @@ mtcc_reparent(const char *new_anchor_url /* Create directory open operations for new ancestors */ while (*up) { - svn_client_mtcc_op_t *root_op; + mtcc_op_t *root_op; mtcc->root_op->name = svn_relpath_basename(up, mtcc->pool); up = svn_relpath_dirname(up, scratch_pool); root_op = mtcc_op_create(NULL, FALSE, TRUE, mtcc->pool); - APR_ARRAY_PUSH(root_op->children, - svn_client_mtcc_op_t *) = mtcc->root_op; + APR_ARRAY_PUSH(root_op->children, mtcc_op_t *) = mtcc->root_op; mtcc->root_op = root_op; } @@ -438,7 +436,7 @@ mtcc_reparent(const char *new_anchor_url /* Check if it is safe to create a new node at NEW_RELPATH. Return a proper error if it is not */ static svn_error_t * -mtcc_verify_create(svn_client_mtcc_t *mtcc, +mtcc_verify_create(svn_client__mtcc_t *mtcc, const char *new_relpath, apr_pool_t *scratch_pool) { @@ -446,7 +444,7 @@ mtcc_verify_create(svn_client_mtcc_t *mt if (*new_relpath || !MTCC_UNMODIFIED(mtcc)) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; SVN_ERR(mtcc_op_find(&op, NULL, new_relpath, mtcc->root_op, TRUE, FALSE, FALSE, mtcc->pool, scratch_pool)); @@ -465,8 +463,8 @@ mtcc_verify_create(svn_client_mtcc_t *mt /* mod_dav_svn allows overwriting existing directories. Let's hide that for users of this api */ - SVN_ERR(svn_client_mtcc_check_path(&kind, new_relpath, FALSE, - mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, new_relpath, FALSE, + mtcc, scratch_pool)); if (kind != svn_node_none) return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL, @@ -478,13 +476,13 @@ mtcc_verify_create(svn_client_mtcc_t *mt svn_error_t * -svn_client_mtcc_add_add_file(const char *relpath, - svn_stream_t *src_stream, - const svn_checksum_t *src_checksum, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_add_file(const char *relpath, + svn_stream_t *src_stream, + const svn_checksum_t *src_checksum, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; svn_boolean_t created; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath) && src_stream); @@ -517,13 +515,13 @@ svn_client_mtcc_add_add_file(const char } svn_error_t * -svn_client_mtcc_add_copy(const char *src_relpath, - svn_revnum_t revision, - const char *dst_relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_copy(const char *src_relpath, + svn_revnum_t revision, + const char *dst_relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; svn_boolean_t created; svn_node_kind_t kind; @@ -569,18 +567,18 @@ svn_client_mtcc_add_copy(const char *src } svn_error_t * -svn_client_mtcc_add_delete(const char *relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_delete(const char *relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; svn_boolean_t created; svn_node_kind_t kind; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); - SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, - mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, + mtcc, scratch_pool)); if (kind == svn_node_none) return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL, @@ -614,11 +612,11 @@ svn_client_mtcc_add_delete(const char *r } svn_error_t * -svn_client_mtcc_add_mkdir(const char *relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_mkdir(const char *relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; svn_boolean_t created; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); @@ -648,10 +646,10 @@ svn_client_mtcc_add_mkdir(const char *re } svn_error_t * -svn_client_mtcc_add_move(const char *src_relpath, - const char *dst_relpath, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_move(const char *src_relpath, + const char *dst_relpath, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { const char *origin_relpath; svn_revnum_t origin_rev; @@ -660,9 +658,9 @@ svn_client_mtcc_add_move(const char *src src_relpath, FALSE, mtcc, scratch_pool, scratch_pool)); - SVN_ERR(svn_client_mtcc_add_copy(src_relpath, mtcc->base_revision, - dst_relpath, mtcc, scratch_pool)); - SVN_ERR(svn_client_mtcc_add_delete(src_relpath, mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_add_copy(src_relpath, mtcc->base_revision, + dst_relpath, mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_add_delete(src_relpath, mtcc, scratch_pool)); return SVN_NO_ERROR; } @@ -670,7 +668,7 @@ svn_client_mtcc_add_move(const char *src /* Baton for mtcc_prop_getter */ struct mtcc_prop_get_baton { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; const char *relpath; svn_cancel_func_t cancel_func; void *cancel_baton; @@ -688,7 +686,7 @@ mtcc_prop_getter(const svn_string_t **mi svn_revnum_t origin_rev; apr_hash_t *props = NULL; - svn_client_mtcc_op_t *op; + mtcc_op_t *op; if (mime_type) *mime_type = NULL; @@ -765,14 +763,14 @@ mtcc_prop_getter(const svn_string_t **mi } svn_error_t * -svn_client_mtcc_add_propset(const char *relpath, - const char *propname, - const svn_string_t *propval, - svn_boolean_t skip_checks, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_propset(const char *relpath, + const char *propname, + const svn_string_t *propval, + svn_boolean_t skip_checks, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); if (! svn_prop_name_is_valid(propname)) @@ -805,8 +803,8 @@ svn_client_mtcc_add_propset(const char * { struct mtcc_prop_get_baton mpbg; svn_node_kind_t kind; - SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, mtcc, - scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, mtcc, + scratch_pool)); mpbg.mtcc = mtcc; mpbg.relpath = relpath; @@ -826,8 +824,8 @@ svn_client_mtcc_add_propset(const char * /* Probing the node for an unmodified root will fix the node type to a file if necessary */ - SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, - mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, + mtcc, scratch_pool)); if (kind == svn_node_none) return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, @@ -849,8 +847,8 @@ svn_client_mtcc_add_propset(const char * /* ### TODO: Check if this node is within a newly copied directory, and update origin values accordingly */ - SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, - mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, + mtcc, scratch_pool)); if (kind == svn_node_none) return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, @@ -884,21 +882,21 @@ svn_client_mtcc_add_propset(const char * } svn_error_t * -svn_client_mtcc_add_update_file(const char *relpath, - svn_stream_t *src_stream, - const svn_checksum_t *src_checksum, - svn_stream_t *base_stream, - const svn_checksum_t *base_checksum, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_add_update_file(const char *relpath, + svn_stream_t *src_stream, + const svn_checksum_t *src_checksum, + svn_stream_t *base_stream, + const svn_checksum_t *base_checksum, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { - svn_client_mtcc_op_t *op; + mtcc_op_t *op; svn_boolean_t created; svn_node_kind_t kind; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath) && src_stream); - SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, - mtcc, scratch_pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, + mtcc, scratch_pool)); if (kind != svn_node_file) return svn_error_createf(SVN_ERR_FS_NOT_FILE, NULL, @@ -929,15 +927,15 @@ svn_client_mtcc_add_update_file(const ch } svn_error_t * -svn_client_mtcc_check_path(svn_node_kind_t *kind, - const char *relpath, - svn_boolean_t check_repository, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_check_path(svn_node_kind_t *kind, + const char *relpath, + svn_boolean_t check_repository, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { const char *origin_relpath; svn_revnum_t origin_rev; - svn_client_mtcc_op_t *op; + mtcc_op_t *op; SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); @@ -1018,7 +1016,7 @@ svn_client_mtcc_check_path(svn_node_kind static svn_error_t * commit_properties(const svn_delta_editor_t *editor, - const svn_client_mtcc_op_t *op, + const mtcc_op_t *op, void *node_baton, apr_pool_t *scratch_pool) { @@ -1050,7 +1048,7 @@ commit_properties(const svn_delta_editor /* Handles updating a file to a delta editor and then closes it */ static svn_error_t * commit_file(const svn_delta_editor_t *editor, - svn_client_mtcc_op_t *op, + mtcc_op_t *op, void *file_baton, const char *session_url, const char *relpath, @@ -1127,7 +1125,7 @@ commit_file(const svn_delta_editor_t *ed /* Handles updating a directory to a delta editor and then closes it */ static svn_error_t * commit_directory(const svn_delta_editor_t *editor, - svn_client_mtcc_op_t *op, + mtcc_op_t *op, const char *relpath, svn_revnum_t base_rev, void *dir_baton, @@ -1144,11 +1142,11 @@ commit_directory(const svn_delta_editor_ for (i = 0; i < op->children->nelts; i++) { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; const char * child_relpath; void *child_baton; - cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *); + cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *); svn_pool_clear(iterpool); @@ -1219,7 +1217,7 @@ commit_directory(const svn_delta_editor_ /* Helper function to recursively create svn_client_commit_item3_t items to provide to the log message callback */ static svn_error_t * -add_commit_items(svn_client_mtcc_op_t *op, +add_commit_items(mtcc_op_t *op, const char *session_url, const char *url, apr_array_header_t *commit_items, @@ -1278,10 +1276,10 @@ add_commit_items(svn_client_mtcc_op_t *o for (i = 0; i < op->children->nelts; i++) { - svn_client_mtcc_op_t *cop; + mtcc_op_t *cop; const char * child_url; - cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *); + cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *); svn_pool_clear(iterpool); @@ -1298,11 +1296,11 @@ add_commit_items(svn_client_mtcc_op_t *o } svn_error_t * -svn_client_mtcc_commit(apr_hash_t *revprop_table, - svn_commit_callback2_t commit_callback, - void *commit_baton, - svn_client_mtcc_t *mtcc, - apr_pool_t *scratch_pool) +svn_client__mtcc_commit(apr_hash_t *revprop_table, + svn_commit_callback2_t commit_callback, + void *commit_baton, + svn_client__mtcc_t *mtcc, + apr_pool_t *scratch_pool) { const svn_delta_editor_t *editor; void *edit_baton; Modified: subversion/trunk/subversion/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1614599&r1=1614598&r2=1614599&view=diff ============================================================================== --- subversion/trunk/subversion/svnmucc/svnmucc.c (original) +++ subversion/trunk/subversion/svnmucc/svnmucc.c Wed Jul 30 10:02:09 2014 @@ -43,7 +43,7 @@ #include "svn_private_config.h" #include "svn_hash.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "svn_cmdline.h" #include "svn_config.h" #include "svn_error.h" @@ -136,16 +136,16 @@ execute(const apr_array_header_t *action svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; apr_pool_t *iterpool = svn_pool_create(pool); svn_error_t *err; int i; - SVN_ERR(svn_client_mtcc_create(&mtcc, anchor, - SVN_IS_VALID_REVNUM(base_revision) - ? base_revision - : SVN_INVALID_REVNUM, - ctx, pool, iterpool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, anchor, + SVN_IS_VALID_REVNUM(base_revision) + ? base_revision + : SVN_INVALID_REVNUM, + ctx, pool, iterpool)); for (i = 0; i < actions->nelts; ++i) { @@ -160,29 +160,29 @@ execute(const apr_array_header_t *action case ACTION_MV: path1 = subtract_anchor(anchor, action->path[0], pool); path2 = subtract_anchor(anchor, action->path[1], pool); - SVN_ERR(svn_client_mtcc_add_move(path1, path2, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_move(path1, path2, mtcc, iterpool)); break; case ACTION_CP: path1 = subtract_anchor(anchor, action->path[0], pool); path2 = subtract_anchor(anchor, action->path[1], pool); - SVN_ERR(svn_client_mtcc_add_copy(path1, action->rev, path2, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_copy(path1, action->rev, path2, + mtcc, iterpool)); break; case ACTION_RM: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_delete(path1, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_delete(path1, mtcc, iterpool)); break; case ACTION_MKDIR: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_mkdir(path1, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_mkdir(path1, mtcc, iterpool)); break; case ACTION_PUT: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_check_path(&kind, path1, TRUE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, path1, TRUE, mtcc, pool)); if (kind == svn_node_dir) { - SVN_ERR(svn_client_mtcc_add_delete(path1, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete(path1, mtcc, pool)); kind = svn_node_none; } @@ -197,20 +197,20 @@ execute(const apr_array_header_t *action if (kind == svn_node_file) - SVN_ERR(svn_client_mtcc_add_update_file(path1, src, NULL, - NULL, NULL, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_update_file(path1, src, NULL, + NULL, NULL, + mtcc, iterpool)); else if (kind == svn_node_none) - SVN_ERR(svn_client_mtcc_add_add_file(path1, src, NULL, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_add_file(path1, src, NULL, + mtcc, iterpool)); } break; case ACTION_PROPSET: case ACTION_PROPDEL: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_propset(path1, action->prop_name, - action->prop_value, FALSE, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_propset(path1, action->prop_name, + action->prop_value, FALSE, + mtcc, iterpool)); break; case ACTION_PROPSETF: default: @@ -218,8 +218,8 @@ execute(const apr_array_header_t *action } } - err = svn_client_mtcc_commit(revprops, commit_callback, NULL, - mtcc, iterpool); + err = svn_client__mtcc_commit(revprops, commit_callback, NULL, + mtcc, iterpool); svn_pool_destroy(iterpool); return svn_error_trace(err);; Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1614599&r1=1614598&r2=1614599&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Wed Jul 30 10:02:09 2014 @@ -31,7 +31,7 @@ #include "../../libsvn_client/client.h" #include "svn_pools.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "svn_repos.h" #include "svn_subst.h" #include "private/svn_wc_private.h" @@ -776,7 +776,7 @@ test_suggest_mergesources(const svn_test { const char *repos_url; svn_client_ctx_t *ctx; - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; apr_array_header_t *results; svn_opt_revision_t peg_rev; svn_opt_revision_t head_rev; @@ -789,9 +789,9 @@ test_suggest_mergesources(const svn_test SVN_ERR(svn_client_create_context(&ctx, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "AA", mtcc, pool)); - SVN_ERR(svn_client_mtcc_commit(NULL, NULL, NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "AA", mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, NULL, NULL, mtcc, pool)); SVN_ERR(svn_client_suggest_merge_sources( &results, @@ -912,7 +912,7 @@ test_remote_only_status(const svn_test_o const char *local_path; apr_file_t *local_file; svn_client_ctx_t *ctx; - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_opt_revision_t rev; svn_revnum_t result_rev; svn_string_t *contents = svn_string_create("modified\n", pool); @@ -931,23 +931,23 @@ test_remote_only_status(const svn_test_o SVN_ERR(svn_client_create_context(&ctx, pool)); /* Make some modifications in the repository, creating revision 2. */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_add_file("A/epsilon", contentstream, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("A/epsilon", contentstream, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_update_file("A/mu", - contentstream, NULL, NULL, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("A/mu", + contentstream, NULL, NULL, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_add_file("A/D/epsilon", contentstream, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("A/D/epsilon", contentstream, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_update_file("A/B/lambda", - contentstream, NULL, NULL, NULL, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_delete("A/C", mtcc, pool)); - SVN_ERR(svn_client_mtcc_commit(NULL, NULL, NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("A/B/lambda", + contentstream, NULL, NULL, NULL, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("A/C", mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, NULL, NULL, mtcc, pool)); /* Check out a sparse root @r1 of the repository */ wc_path = svn_test_data_path("test-remote-only-status-wc", pool); Modified: subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c?rev=1614599&r1=1614598&r2=1614599&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c Wed Jul 30 10:02:09 2014 @@ -24,7 +24,7 @@ #include "svn_pools.h" #include "svn_props.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "../svn_test.h" #include "../svn_test_fs.h" @@ -57,7 +57,7 @@ cstr_stream(const char *data, apr_pool_t } static svn_error_t * -verify_mtcc_commit(svn_client_mtcc_t *mtcc, +verify_mtcc_commit(svn_client__mtcc_t *mtcc, svn_revnum_t expected_rev, apr_pool_t *pool) { @@ -65,7 +65,7 @@ verify_mtcc_commit(svn_client_mtcc_t *mt vcb.commit_info = NULL; vcb.result_pool = pool; - SVN_ERR(svn_client_mtcc_commit(NULL, verify_commit_callback, &vcb, mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, verify_commit_callback, &vcb, mtcc, pool)); SVN_TEST_ASSERT(vcb.commit_info != NULL); SVN_TEST_ASSERT(vcb.commit_info->revision == expected_rev); @@ -79,7 +79,7 @@ static svn_error_t * make_greek_tree(const char *repos_url, apr_pool_t *scratch_pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; apr_pool_t *subpool; int i; @@ -87,13 +87,13 @@ make_greek_tree(const char *repos_url, subpool = svn_pool_create(scratch_pool); SVN_ERR(svn_client_create_context2(&ctx, NULL, subpool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 0, ctx, subpool, subpool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 0, ctx, subpool, subpool)); for (i = 0; svn_test__greek_tree_nodes[i].path; i++) { if (svn_test__greek_tree_nodes[i].contents) { - SVN_ERR(svn_client_mtcc_add_add_file( + SVN_ERR(svn_client__mtcc_add_add_file( svn_test__greek_tree_nodes[i].path, cstr_stream( svn_test__greek_tree_nodes[i].contents, @@ -103,7 +103,7 @@ make_greek_tree(const char *repos_url, } else { - SVN_ERR(svn_client_mtcc_add_mkdir( + SVN_ERR(svn_client__mtcc_add_mkdir( svn_test__greek_tree_nodes[i].path, mtcc, subpool)); } @@ -119,7 +119,7 @@ static svn_error_t * test_mkdir(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -131,14 +131,14 @@ test_mkdir(const svn_test_opts_t *opts, SVN_ERR(svn_test__create_repos(&repos, repos_abspath, opts, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 0, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 0, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("branches", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("trunk", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("branches/1.x", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags/1.0", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags/1.1", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("branches", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("trunk", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("branches/1.x", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags/1.0", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags/1.1", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 1, pool)); @@ -149,7 +149,7 @@ static svn_error_t * test_mkgreek(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -163,9 +163,9 @@ test_mkgreek(const svn_test_opts_t *opts SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "greek_A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "greek_A", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); @@ -176,7 +176,7 @@ static svn_error_t * test_swap(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -190,11 +190,11 @@ test_swap(const svn_test_opts_t *opts, SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_move("A/B", "B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_move("A/D", "A/B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A/B", 1, "A/D", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_move("A/B", "B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_move("A/D", "A/B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A/B", 1, "A/D", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); @@ -205,7 +205,7 @@ static svn_error_t * test_propset(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -219,55 +219,55 @@ test_propset(const svn_test_opts_t *opts SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("iota", "key", - svn_string_create("val", pool), FALSE, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("A", "A-key", - svn_string_create("val-A", pool), FALSE, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("A/B", "B-key", - svn_string_create("val-B", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("iota", "key", + svn_string_create("val", pool), FALSE, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A", "A-key", + svn_string_create("val-A", pool), FALSE, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/B", "B-key", + svn_string_create("val-B", pool), FALSE, + mtcc, pool)); /* The repository ignores propdeletes of properties that aren't there, so this just works */ - SVN_ERR(svn_client_mtcc_add_propset("A/D", "D-key", NULL, FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/D", "D-key", NULL, FALSE, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 2, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 2, ctx, pool, pool)); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("A", SVN_PROP_MIME_TYPE, - svn_string_create("text/plain", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("A", SVN_PROP_MIME_TYPE, + svn_string_create("text/plain", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("iota", SVN_PROP_IGNORE, - svn_string_create("iota", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("iota", SVN_PROP_IGNORE, + svn_string_create("iota", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); - SVN_ERR(svn_client_mtcc_add_propset("iota", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_add_file("ok", cstr_stream("line\nline\n", pool), - NULL, mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_add_file("bad", cstr_stream("line\nno\r\n", pool), - NULL, mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_propset("ok", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("iota", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_add_file("ok", cstr_stream("line\nline\n", pool), + NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("bad", cstr_stream("line\nno\r\n", pool), + NULL, mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_propset("ok", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool)); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("bad", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("bad", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); SVN_ERR(verify_mtcc_commit(mtcc, 3, pool)); @@ -279,7 +279,7 @@ static svn_error_t * test_update_files(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -293,33 +293,33 @@ test_update_files(const svn_test_opts_t SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); /* Update iota with knowledge of the old data */ - SVN_ERR(svn_client_mtcc_add_update_file(svn_test__greek_tree_nodes[0].path, - cstr_stream("new-iota", pool), - NULL, - cstr_stream( - svn_test__greek_tree_nodes[0] - .contents, - pool), - NULL, - mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_update_file("A/mu", - cstr_stream("new-MU", pool), - NULL, - NULL, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file(svn_test__greek_tree_nodes[0].path, + cstr_stream("new-iota", pool), + NULL, + cstr_stream( + svn_test__greek_tree_nodes[0] + .contents, + pool), + NULL, + mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_update_file("A/mu", + cstr_stream("new-MU", pool), + NULL, + NULL, NULL, + mtcc, pool)); /* Set a property on the same node */ - SVN_ERR(svn_client_mtcc_add_propset("A/mu", "mu-key", - svn_string_create("mu-A", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/mu", "mu-key", + svn_string_create("mu-A", pool), FALSE, + mtcc, pool)); /* And some other node */ - SVN_ERR(svn_client_mtcc_add_propset("A/B", "B-key", - svn_string_create("val-B", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/B", "B-key", + svn_string_create("val-B", pool), FALSE, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); return SVN_NO_ERROR; @@ -329,7 +329,7 @@ static svn_error_t * test_overwrite(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -343,17 +343,17 @@ test_overwrite(const svn_test_opts_t *op SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "AA", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "AA", mtcc, pool)); - SVN_TEST_ASSERT_ERROR(svn_client_mtcc_add_mkdir("AA/B", mtcc, pool), + SVN_TEST_ASSERT_ERROR(svn_client__mtcc_add_mkdir("AA/B", mtcc, pool), SVN_ERR_FS_ALREADY_EXISTS); - SVN_TEST_ASSERT_ERROR(svn_client_mtcc_add_mkdir("AA/D/H/chi", mtcc, pool), + SVN_TEST_ASSERT_ERROR(svn_client__mtcc_add_mkdir("AA/D/H/chi", mtcc, pool), SVN_ERR_FS_ALREADY_EXISTS); - SVN_ERR(svn_client_mtcc_add_mkdir("AA/BB", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("AA/BB", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); return SVN_NO_ERROR; @@ -363,7 +363,7 @@ static svn_error_t * test_anchoring(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -379,70 +379,70 @@ test_anchoring(const svn_test_opts_t *op SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); /* Update a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "iota", - pool), - 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_update_file("", - cstr_stream("new-iota", pool), - NULL, NULL, NULL, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("value", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "iota", + pool), + 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("", + cstr_stream("new-iota", pool), + NULL, NULL, NULL, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("value", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); /* Add a directory as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "BB", - pool), - 2, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("", mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "BB", + pool), + 2, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 3, pool)); /* Add a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "new", - pool), - 3, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_add_file("", cstr_stream("new", pool), NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "new", + pool), + 3, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("", cstr_stream("new", pool), NULL, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 4, pool)); /* Delete as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "new", - pool), - 4, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_delete("", mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "new", + pool), + 4, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_delete("", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 5, pool)); /* Propset file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "A/mu", - pool), - 5, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "A/mu", + pool), + 5, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 6, pool)); /* Propset dir as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "A", - pool), - 6, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "A", + pool), + 6, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 7, pool)); /* Propset reposroot as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 7, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 7, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 8, pool)); return SVN_NO_ERROR; @@ -452,7 +452,7 @@ static svn_error_t * test_replace_tree(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -468,16 +468,16 @@ test_replace_tree(const svn_test_opts_t SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); /* Update a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_delete("A", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_delete("iota", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A/B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A/B/C", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M/N", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M/N/O", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("iota", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A/B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A/B/C", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M/N", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M/N/O", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool));
