Re: svn commit: r15897 - in trunk/subversion: clients/cmdline libsvn_client

[Philip Martin <ph...@codematters.co.uk>]

dionisos@tigris.org writes:

> Author: dionisos
> Date: Wed Aug 24 17:21:18 2005
> New Revision: 15897

> --- trunk/subversion/clients/cmdline/commit-cmd.c	(original)
> +++ trunk/subversion/clients/cmdline/commit-cmd.c	Wed Aug 24 17:21:18 2005
> @@ -86,13 +86,13 @@
>       to store the temp file, instead of the current working directory.  The 
>       client might not have write access to their working directory, but they 
>       better have write access to the directory they're committing.  */
> -  SVN_ERR (svn_cl__make_log_msg_baton (&(ctx->log_msg_baton),
> +  SVN_ERR (svn_cl__make_log_msg_baton (&(ctx->log_msg_baton2),
>                                         opt_state, base_dir, 
>                                         ctx->config, pool));
>  
>    /* Commit. */
>    SVN_ERR (svn_cl__cleanup_log_msg
> -           (ctx->log_msg_baton, svn_client_commit3 (&commit_info,
> +           (ctx->log_msg_baton2, svn_client_commit3 (&commit_info,
>                                                      targets,

Indentation.

>                                                      opt_state->nonrecursive
>                                                      ? FALSE : TRUE,
>

> --- trunk/subversion/clients/cmdline/import-cmd.c	(original)
> +++ trunk/subversion/clients/cmdline/import-cmd.c	Wed Aug 24 17:21:18 2005
> @@ -104,10 +104,10 @@
>      svn_cl__get_notifier (&ctx->notify_func2, &ctx->notify_baton2,
>                            FALSE, FALSE, FALSE, pool);
>  
> -  SVN_ERR (svn_cl__make_log_msg_baton (&(ctx->log_msg_baton), opt_state, 
> +  SVN_ERR (svn_cl__make_log_msg_baton (&(ctx->log_msg_baton2), opt_state,
>                                         NULL, ctx->config, pool));
>    SVN_ERR (svn_cl__cleanup_log_msg 
> -           (ctx->log_msg_baton, svn_client_import2 (&commit_info,
> +           (ctx->log_msg_baton2, svn_client_import2 (&commit_info,
>                                                      path,

Indentation.

>                                                      url,
>                                                      opt_state->nonrecursive,

> --- trunk/subversion/include/svn_client.h	(original)
> +++ trunk/subversion/include/svn_client.h	Wed Aug 24 17:21:18 2005
> @@ -308,7 +308,7 @@
>  
>  /**
>   * @name Commit state flags
> - * @brief State flags for use with the @c svn_client_commit_item_t structure
> + * @brief State flags for use with the @c svn_client_commit_item2_t structure
>   * (see the note about the namespace for that structure, which also
>   * applies to these flags).
>   * @{
> @@ -322,7 +322,49 @@
>  #define SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN  0x20
>  /** @} */
>  
> -/** The commit candidate structure. */
> +/** The commit candidate structure.
> + *
> + * @since New in 1.3.
> + */
> +typedef struct svn_client_commit_item2_t
> +{
> +  /** absolute working-copy path of item */
> +  const char *path;
> +
> +  /** node kind (dir, file) */
> +  svn_node_kind_t kind;
> +
> +  /** commit URL for this item */
> +  const char *url;
> +
> +  /** revision */

Comments like that don't contribute very much.  Is there a Doxygen
reason for it to be present?

> +  svn_revnum_t revision;
> +
> +  /** copyfrom-url */
> +  const char *copyfrom_url;
> +  
> +  /** copyfrom-rev, valid when copyfrom_url != NULL */
> +  svn_revnum_t copyfrom_rev;
> +  
> +  /** state flags */
> +  apr_byte_t state_flags;
> +
> +  /** An array of `svn_prop_t *' changes to wc properties.  If adding
> +   * to this array, allocate the svn_prop_t and its contents in
> +   * wcprop_changes->pool, so that it has the same lifetime as this
> +   * svn_client_commit_item_t.
> +   *
> +   * See http://subversion.tigris.org/issues/show_bug.cgi?id=806 for
> +   * what would happen if the post-commit process didn't group these
> +   * changes together with all other changes to the item :-).
> +   */
> +  apr_array_header_t *wcprop_changes;
> +} svn_client_commit_item2_t;
> +
> +/** The commit candidate structure.
> + *
> + * @deprecated Provided for backward compatibility with the 1.2 API.
> + */
>  typedef struct svn_client_commit_item_t
>  {
>    /** absolute working-copy path of item */
> @@ -367,6 +409,33 @@
>   * @c NULL, this value is undefined).  The log message MUST be a UTF8 
>   * string with LF line separators.
>   *
> + * @a commit_items is a read-only array of @c svn_client_commit_item2_t
> + * structures, which may be fully or only partially filled-in,
> + * depending on the type of commit operation.
> + *
> + * @a baton is provided along with the callback for use by the handler.
> + *
> + * All allocations should be performed in @a pool.
> + *
> + * @since New in 1.3.
> + */
> +typedef svn_error_t *
> +(*svn_client_get_commit_log2_t) (const char **log_msg,
> +                                 const char **tmp_file,
> +                                 apr_array_header_t *commit_items,

The docs above say it's read-only, perhaps it should be const?

> +                                 void *baton,
> +                                 apr_pool_t *pool);
> +

> --- trunk/subversion/libsvn_client/commit_util.c	(original)
> +++ trunk/subversion/libsvn_client/commit_util.c	Wed Aug 24 17:21:18 2005
> @@ -961,7 +966,7 @@
>                  apr_pool_t *pool)
>  {
>    struct path_driver_cb_baton *cb_baton = callback_baton;
> -  svn_client_commit_item_t *item = apr_hash_get (cb_baton->commit_items,
> +  svn_client_commit_item2_t *item = apr_hash_get (cb_baton->commit_items,
>                                                   path, APR_HASH_KEY_STRING);

Indentation.

>    svn_node_kind_t kind = item->kind;
>    void *file_baton = NULL;

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org