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

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

From: Joe Swatosh <joe.swatosh_at_gmail.com>
Date: Sun, 6 Sep 2009 15:48:23 -0700

On Thu, Sep 3, 2009 at 9:31 AM, Hyrum K. Wright<hyrum_at_hyrumwright.org> wrote:
> Author: hwright
> Date: Thu Sep  3 09:31:21 2009
> New Revision: 39115
>
> Log:
> Remove another call to svn_wc_walk_entries3(), and add an additional helper
> function to retrieving node information.
>
> * subversion/include/private/svn_wc_private.h
>  (svn_wc__node_get_changelist): New.
>
> * subversion/libsvn_wc/node.c
>  (svn_wc__node_get_changelist): New.
>
> * subversion/libsvn_client/changelist.c
>  (get_cl_fe_baton): Rename to...
>  (get_cl_fn_baton): ...this.
>  (get_entry_changelist): Remove.
>  (get_node_changelist): New.
>  (get_cl_entry_callbacks): Remove.
>  (get_cl_node_callbacks): New.
>  (svn_client_get_changelists): Eliminate the need for an access baton by
>    using the new node walker.
>

>
> Modified: trunk/subversion/libsvn_wc/node.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/node.c?pathrev=39115&r1=39114&r2=39115
> ==============================================================================
> --- trunk/subversion/libsvn_wc/node.c   Thu Sep  3 09:24:23 2009        (r39114)
> +++ trunk/subversion/libsvn_wc/node.c   Thu Sep  3 09:31:21 2009        (r39115)
> @@ -170,6 +170,33 @@ svn_wc__node_get_kind(svn_node_kind_t *k
>   return SVN_NO_ERROR;
>  }
>
> +svn_error_t *
> +svn_wc__node_get_changelist(const char **changelist,
> +                            svn_wc_context_t *wc_ctx,
> +                            const char *local_abspath,
> +                            apr_pool_t *result_pool,
> +                            apr_pool_t *scratch_pool)
> +{
> +  svn_error_t *err;
> +
> +  err = svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +                             NULL, NULL, NULL, NULL, NULL, NULL,
> +                             changelist,
> +                             NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +                             NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +                             wc_ctx->db, local_abspath, result_pool,
> +                             scratch_pool);

Maybe

  err = svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                             NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                             changelist,
                             NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                             NULL, NULL, NULL, NULL, NULL, NULL,
                             wc_ctx->db, local_abspath, result_pool,
                             scratch_pool);

(one more NULL before the changelist parameter and one fewer after)?

> +
> +  if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
> +    {
> +      svn_error_clear(err);
> +      err = SVN_NO_ERROR;
> +      *changelist = NULL;
> +    }
> +
> +  return svn_error_return(err);
> +}
> +
>  /* A recursive node-walker, helper for svn_wc__node_walk_children(). */
>  static svn_error_t *
>  walker_helper(svn_wc__db_t *db,
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2390739
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391707
Received on 2009-09-07 00:48:38 CEST

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