[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r932571 - in /subversion/trunk/subversion: include/ include/private/ libsvn_client/ libsvn_wc/ svn/

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 9 Apr 2010 16:16:30 -0400

On Fri, Apr 9, 2010 at 16:07, <dannas_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/include/svn_wc.h Fri Apr  9 20:07:51 2010
> @@ -3530,8 +3530,121 @@ enum svn_wc_status_kind
>  * @note Fields may be added to the end of this structure in future
>  * versions.  Therefore, to preserve binary compatibility, users
>  * should not directly allocate structures of this type.
> + */
> +typedef struct svn_wc_status3_t

There should be an @since tag above.

> +{
> +  /** Can be @c NULL if not under version control. */
> +  const svn_wc_entry_t *entry;
> +
> +  /** The status of the entry itself, including its text if it is a file. */
> +  enum svn_wc_status_kind text_status;
> +
> +  /** The status of the entry's properties. */
> +  enum svn_wc_status_kind prop_status;
> +
> +  /** a directory can be 'locked' if a working copy update was interrupted. */
> +  svn_boolean_t locked;
> +
> +  /** a file or directory can be 'copied' if it's scheduled for
> +   * addition-with-history (or part of a subtree that is scheduled as such.).
> +   */
> +  svn_boolean_t copied;
> +
> +  /** a file or directory can be 'switched' if the switch command has been
> +   * used.  If this is TRUE, then file_external will be FALSE.
> +   */
> +  svn_boolean_t switched;
> +
> +  /** The entry's text status in the repository. */
> +  enum svn_wc_status_kind repos_text_status;
> +
> +  /** The entry's property status in the repository. */
> +  enum svn_wc_status_kind repos_prop_status;
> +
> +  /** The entry's lock in the repository, if any. */
> +  svn_lock_t *repos_lock;
> +
> +  /** Set to the URI (actual or expected) of the item.
> +   * @since New in 1.3
> +   */

This @since marker and others don't need to be here, since the whole
struct is @since New in 1.7

>...
> +svn_wc_status3_t *
> +svn_wc_dup_status3(const svn_wc_status3_t *orig_stat,
> +                   apr_pool_t *pool);
> +
> +/**
> + * Same as svn_wc_dup_status2(), but for older svn_wc_status_t structures.
> + *
> + * @since New in 1.2
> + * @deprecated Provided for backward compatibility with the 1.6 API.
>  */

"Same as svn_wc_dup_status *3* ..."

>...
> +++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Apr  9 20:07:51 2010
>...
> @@ -2515,13 +2551,15 @@ svn_wc_status2(svn_wc_status2_t **status
>  {
>   const char *local_abspath;
>   svn_wc_context_t *wc_ctx;
> +  svn_wc_status3_t *stat3;
>
>   SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
>   SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL /* config */,
>                                          svn_wc__adm_get_db(adm_access),
>                                          pool));
>
> -  SVN_ERR(svn_wc_status3(status, wc_ctx, local_abspath, pool, pool));
> +  SVN_ERR(svn_wc_status3(&stat3, wc_ctx, local_abspath, pool, pool));
> +  *status = (svn_wc_status2_t *) stat3;

Another funky cast. Make sure this gets handled with your new
converter function.

>...

Cheers,
-g
Received on 2010-04-09 22:16:58 CEST

This is an archived mail posted to the Subversion Dev mailing list.