Index: subversion/include/svn_client.h =================================================================== --- subversion/include/svn_client.h (revision 16048) +++ subversion/include/svn_client.h (working copy) @@ -264,29 +264,6 @@ } svn_client_proplist_item_t; -/** Information about commits passed back to clients from this module. - * - * @note Objects of this type should always be created using the - * svn_client_create_commit_info() function. - * - * @since New in 1.3. - */ -typedef struct svn_client_commit_info2_t -{ - /** just-committed revision. */ - svn_revnum_t revision; - - /** server-side date of the commit. */ - const char *date; - - /** author of the commit. */ - const char *author; - - /** error message from post-commit hook, or NULL. */ - const char *post_commit_err; - -} svn_client_commit_info2_t; - /** Information about commits passed back to client from this module. * * ### This struct is soon going to be deprecated. @@ -578,23 +555,6 @@ apr_pool_t *pool); /** - * Allocate an object of type @c svn_client_commit_info2_t in @a pool and - * return it. - * - * The @c revision field of the new struct is set to @c - * SVN_INVALID_REVNUM. All other fields are initialized to @c NULL. - * - * @note Any object of the type @c svn_client_commit_info2_t should - * be created using this function. - * This is to provide for extending the svn_client_commit_info2_t in - * the future. - * - * @since New in 1.3. - */ -svn_client_commit_info2_t * -svn_client_create_commit_info (apr_pool_t *pool); - -/** * Checkout a working copy of @a URL at @a revision, looked up at @a * peg_revision, using @a path as the root directory of the newly * checked out working copy, and authenticating with the @@ -835,7 +795,7 @@ * @since New in 1.3. */ svn_error_t * -svn_client_mkdir2 (svn_client_commit_info2_t **commit_info, +svn_client_mkdir2 (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_client_ctx_t *ctx, apr_pool_t *pool); @@ -885,7 +845,7 @@ * @since New in 1.3. */ svn_error_t * -svn_client_delete2 (svn_client_commit_info2_t **commit_info, +svn_client_delete2 (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_boolean_t force, svn_client_ctx_t *ctx, @@ -947,7 +907,7 @@ * * @since New in 1.3. */ -svn_error_t *svn_client_import2 (svn_client_commit_info2_t **commit_info, +svn_error_t *svn_client_import2 (svn_commit_info_t **commit_info, const char *path, const char *url, svn_boolean_t nonrecursive, @@ -1001,7 +961,7 @@ * @since New in 1.3. */ svn_error_t * -svn_client_commit3 (svn_client_commit_info2_t **commit_info, +svn_client_commit3 (svn_commit_info_t **commit_info, const apr_array_header_t *targets, svn_boolean_t recurse, svn_boolean_t keep_locks, @@ -1570,7 +1530,7 @@ * @since New in 1.3. */ svn_error_t * -svn_client_copy2 (svn_client_commit_info2_t **commit_info, +svn_client_copy2 (svn_commit_info_t **commit_info, const char *src_path, const svn_opt_revision_t *src_revision, const char *dst_path, @@ -1638,7 +1598,7 @@ * @since New in 1.3. */ svn_error_t * -svn_client_move3 (svn_client_commit_info2_t **commit_info, +svn_client_move3 (svn_commit_info_t **commit_info, const char *src_path, const char *dst_path, svn_boolean_t force, Index: subversion/libsvn_client/delete.c =================================================================== --- subversion/libsvn_client/delete.c (revision 16048) +++ subversion/libsvn_client/delete.c (working copy) @@ -109,7 +109,7 @@ static svn_error_t * -delete_urls (svn_client_commit_info2_t **commit_info, +delete_urls (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -233,7 +233,7 @@ svn_error_t * -svn_client_delete2 (svn_client_commit_info2_t **commit_info, +svn_client_delete2 (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_boolean_t force, svn_client_ctx_t *ctx, @@ -289,7 +289,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err = NULL; err = svn_client_delete2 (&commit_info2, paths, force, ctx, pool); Index: subversion/libsvn_client/client.h =================================================================== --- subversion/libsvn_client/client.h (revision 16048) +++ subversion/libsvn_client/client.h (working copy) @@ -252,7 +252,7 @@ /* Get the commit_baton to be used in couple with commit_callback. */ svn_error_t *svn_client__commit_get_baton (void **baton, - svn_client_commit_info2_t **info, + svn_commit_info_t **info, apr_pool_t *pool); /* The commit_callback function for storing svn_client_commit_info_t Index: subversion/libsvn_client/copy.c =================================================================== --- subversion/libsvn_client/copy.c (revision 16048) +++ subversion/libsvn_client/copy.c (working copy) @@ -271,7 +271,7 @@ static svn_error_t * -repos_to_repos_copy (svn_client_commit_info2_t **commit_info, +repos_to_repos_copy (svn_commit_info_t **commit_info, const char *src_url, const svn_opt_revision_t *src_revision, const char *dst_url, @@ -578,7 +578,7 @@ static svn_error_t * -wc_to_repos_copy (svn_client_commit_info2_t **commit_info, +wc_to_repos_copy (svn_commit_info_t **commit_info, const char *src_path, const char *dst_url, svn_client_ctx_t *ctx, @@ -1005,7 +1005,7 @@ static svn_error_t * -setup_copy (svn_client_commit_info2_t **commit_info, +setup_copy (svn_commit_info_t **commit_info, const char *src_path, const svn_opt_revision_t *src_revision, const char *dst_path, @@ -1117,7 +1117,7 @@ /* Public Interfaces */ svn_error_t * -svn_client_copy2 (svn_client_commit_info2_t **commit_info, +svn_client_copy2 (svn_commit_info_t **commit_info, const char *src_path, const svn_opt_revision_t *src_revision, const char *dst_path, @@ -1141,7 +1141,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; err = svn_client_copy2 (&commit_info2, src_path, src_revision, dst_path, @@ -1152,7 +1152,7 @@ } svn_error_t * -svn_client_move3 (svn_client_commit_info2_t **commit_info, +svn_client_move3 (svn_commit_info_t **commit_info, const char *src_path, const char *dst_path, svn_boolean_t force, @@ -1178,7 +1178,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; err = svn_client_move3 (&commit_info2, src_path, dst_path, force, ctx, pool); @@ -1197,7 +1197,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; /* It doesn't make sense to specify revisions in a move. */ Index: subversion/libsvn_client/commit_util.c =================================================================== --- subversion/libsvn_client/commit_util.c (revision 16048) +++ subversion/libsvn_client/commit_util.c (working copy) @@ -1321,12 +1321,12 @@ /* Commit callback baton */ struct commit_baton { - svn_client_commit_info2_t **info; + svn_commit_info_t **info; apr_pool_t *pool; }; svn_error_t *svn_client__commit_get_baton (void **baton, - svn_client_commit_info2_t **info, + svn_commit_info_t **info, apr_pool_t *pool) { struct commit_baton *cb = apr_pcalloc (pool, sizeof (*cb)); @@ -1343,9 +1343,9 @@ void *baton) { struct commit_baton *cb = baton; - svn_client_commit_info2_t **info = cb->info; + svn_commit_info_t **info = cb->info; - *info = svn_client_create_commit_info (cb->pool); + *info = svn_create_commit_info (cb->pool); (*info)->date = date ? apr_pstrdup (cb->pool, date) : NULL; (*info)->author = author ? apr_pstrdup (cb->pool, author) : NULL; (*info)->revision = revision; Index: subversion/libsvn_client/add.c =================================================================== --- subversion/libsvn_client/add.c (revision 16048) +++ subversion/libsvn_client/add.c (working copy) @@ -495,7 +495,7 @@ static svn_error_t * -mkdir_urls (svn_client_commit_info2_t **commit_info, +mkdir_urls (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -614,7 +614,7 @@ svn_error_t * -svn_client_mkdir2 (svn_client_commit_info2_t **commit_info, +svn_client_mkdir2 (svn_commit_info_t **commit_info, const apr_array_header_t *paths, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -670,7 +670,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; err = svn_client_mkdir2 (&commit_info2, paths, ctx, pool); Index: subversion/libsvn_client/commit.c =================================================================== --- subversion/libsvn_client/commit.c (revision 16048) +++ subversion/libsvn_client/commit.c (working copy) @@ -588,7 +588,7 @@ svn_wc_adm_access_t *base_access, const char *log_msg, apr_array_header_t *commit_items, - svn_client_commit_info2_t **commit_info, + svn_commit_info_t **commit_info, svn_boolean_t is_commit, apr_hash_t *lock_tokens, svn_boolean_t keep_locks, @@ -633,7 +633,7 @@ /*** Public Interfaces. ***/ svn_error_t * -svn_client_import2 (svn_client_commit_info2_t **commit_info, +svn_client_import2 (svn_commit_info_t **commit_info, const char *path, const char *url, svn_boolean_t nonrecursive, @@ -770,9 +770,9 @@ /* Transfer *COMMIT_INFO from the subpool to the callers pool */ if (*commit_info) { - svn_client_commit_info2_t *tmp_commit_info; + svn_commit_info_t *tmp_commit_info; - tmp_commit_info = svn_client_create_commit_info (pool); + tmp_commit_info = svn_create_commit_info (pool); *tmp_commit_info = **commit_info; if (tmp_commit_info->date) tmp_commit_info->date = apr_pstrdup (pool, tmp_commit_info->date); @@ -794,7 +794,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; err = svn_client_import2 (&commit_info2, @@ -1170,20 +1170,9 @@ return SVN_NO_ERROR; } -svn_client_commit_info2_t * -svn_client_create_commit_info (apr_pool_t *pool) -{ - svn_client_commit_info2_t *commit_info - = apr_pcalloc (pool, sizeof (svn_client_commit_info2_t)); - commit_info->revision = SVN_INVALID_REVNUM; - /* All other fields were initialized to NULL above. */ - - return commit_info; -} - svn_error_t * -svn_client_commit3 (svn_client_commit_info2_t **commit_info, +svn_client_commit3 (svn_commit_info_t **commit_info, const apr_array_header_t *targets, svn_boolean_t recurse, svn_boolean_t keep_locks, @@ -1650,7 +1639,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_commit_info2_t *commit_info2 = NULL; + svn_commit_info_t *commit_info2 = NULL; svn_error_t *err; err = svn_client_commit3 (&commit_info2, targets, recurse, keep_locks, Index: subversion/clients/cmdline/cl.h =================================================================== --- subversion/clients/cmdline/cl.h (revision 16048) +++ subversion/clients/cmdline/cl.h (working copy) @@ -226,7 +226,7 @@ /* Print out commit information found in COMMIT_INFO to the console. * POOL is used for temporay allocations. */ -svn_error_t *svn_cl__print_commit_info (svn_client_commit_info2_t *commit_info, +svn_error_t *svn_cl__print_commit_info (svn_commit_info_t *commit_info, apr_pool_t *pool); Index: subversion/clients/cmdline/move-cmd.c =================================================================== --- subversion/clients/cmdline/move-cmd.c (revision 16048) +++ subversion/clients/cmdline/move-cmd.c (working copy) @@ -42,7 +42,7 @@ svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; apr_array_header_t *targets; const char *src_path, *dst_path; - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; svn_error_t *err; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, Index: subversion/clients/cmdline/mkdir-cmd.c =================================================================== --- subversion/clients/cmdline/mkdir-cmd.c (revision 16048) +++ subversion/clients/cmdline/mkdir-cmd.c (working copy) @@ -43,7 +43,7 @@ svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; apr_array_header_t *targets; apr_pool_t *subpool = svn_pool_create (pool); - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; svn_error_t *err; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, Index: subversion/clients/cmdline/copy-cmd.c =================================================================== --- subversion/clients/cmdline/copy-cmd.c (revision 16048) +++ subversion/clients/cmdline/copy-cmd.c (working copy) @@ -43,7 +43,7 @@ apr_array_header_t *targets; const char *src_path, *dst_path; svn_boolean_t src_is_url, dst_is_url; - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; svn_error_t *err; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, Index: subversion/clients/cmdline/util.c =================================================================== --- subversion/clients/cmdline/util.c (revision 16048) +++ subversion/clients/cmdline/util.c (working copy) @@ -50,7 +50,7 @@ svn_error_t * -svn_cl__print_commit_info (svn_client_commit_info2_t *commit_info, +svn_cl__print_commit_info (svn_commit_info_t *commit_info, apr_pool_t *pool) { if ((commit_info) Index: subversion/clients/cmdline/commit-cmd.c =================================================================== --- subversion/clients/cmdline/commit-cmd.c (revision 16048) +++ subversion/clients/cmdline/commit-cmd.c (working copy) @@ -46,7 +46,7 @@ const char *base_dir; svn_config_t *cfg; svn_boolean_t no_unlock = FALSE; - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, opt_state->targets, pool)); Index: subversion/clients/cmdline/delete-cmd.c =================================================================== --- subversion/clients/cmdline/delete-cmd.c (revision 16048) +++ subversion/clients/cmdline/delete-cmd.c (working copy) @@ -41,7 +41,7 @@ svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; apr_array_header_t *targets; - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; svn_error_t *err; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, Index: subversion/clients/cmdline/import-cmd.c =================================================================== --- subversion/clients/cmdline/import-cmd.c (revision 16048) +++ subversion/clients/cmdline/import-cmd.c (working copy) @@ -43,7 +43,7 @@ apr_array_header_t *targets; const char *path; const char *url; - svn_client_commit_info2_t *commit_info = NULL; + svn_commit_info_t *commit_info = NULL; /* Import takes two arguments, for example *