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

Re: svn commit: r920875 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/commit.c libsvn_wc/adm_ops.c

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Tue, 09 Mar 2010 15:45:09 +0000

On Tue, 2010-03-09, philip_at_apache.org wrote:
> Author: philip
> Date: Tue Mar 9 13:53:38 2010
> New Revision: 920875
>
> URL: http://svn.apache.org/viewvc?rev=920875&view=rev
> Log:
> Remove some access batons from post-commit processing.

Hi Philip.

You could add "SVN_DEPRECATED" to svn_wc_queue_committed2(). (You added
it to svn_wc_process_committed_queue().)

Hyrum suggests the deprecated functions should be moved to
'deprecated.c'.

- Julian

> * subversion/include/svn_wc.h
> (svn_wc_queue_committed3, svn_wc_process_committed_queue2): New.
> (svn_wc_queue_committed2, svn_wc_process_committed_queue): Deprecate.
>
> * subversion/libsvn_wc/adm_ops.c
> (struct committed_queue_item_t): Remove adm_abspath.
> (process_committed_internal): Remove adm_abspath parameter, derive
> abspath from path.
> (svn_wc_queue_committed3): Renamed from svn_wc_process_committed_queue2
> with access baton parameter removed.
> (svn_wc_queue_committed2): Call svn_wc_queue_committed3.
> (svn_wc_process_committed_queue2): Renamed svn_wc_process_committed_queue
> with access baton parameter changed to wc context.
> (svn_wc_process_committed_queue): Call svn_wc_process_committed_queue2.
>
> * subversion/libsvn_client/commit.c
> (svn_client_commit4): Call svn_wc_queue_committed3 and
> svn_wc_process_committed_queue2.
>
> Modified:
> subversion/trunk/subversion/include/svn_wc.h
> subversion/trunk/subversion/libsvn_client/commit.c
> subversion/trunk/subversion/libsvn_wc/adm_ops.c
>
> Modified: subversion/trunk/subversion/include/svn_wc.h
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=920875&r1=920874&r2=920875&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/include/svn_wc.h (original)
> +++ subversion/trunk/subversion/include/svn_wc.h Tue Mar 9 13:53:38 2010
> @@ -4729,14 +4729,14 @@ svn_wc_committed_queue_create(apr_pool_t
>
> /**
> * Queue committed items to be processed later by
> - * svn_wc_process_committed_queue().
> + * svn_wc_process_committed_queue2().
> *
> - * All pointer data passed to this function (@a path, @a adm_access,
> - * @a wcprop_changes and @a checksum) should remain valid until the queue
> - * has been processed by svn_wc_process_committed_queue().
> + * All pointer data passed to this function (@a path, @a wcprop_changes
> + * and @a checksum) should remain valid until the queue
> + * has been processed by svn_wc_process_committed_queue2().
> *
> * Record in @a queue that @a path will need to be bumped after a commit
> - * succeeds. @a adm_access must hold a write lock appropriate for @a path.
> + * succeeds.
> *
> * If non-NULL, @a wcprop_changes is an array of <tt>svn_prop_t *</tt>
> * changes to wc properties; if an #svn_prop_t->value is NULL, then
> @@ -4763,7 +4763,25 @@ svn_wc_committed_queue_create(apr_pool_t
> * it will bump ALL nodes under the directory, regardless of their
> * actual inclusion in the new revision.
> *
> + * @since New in 1.7.
> + */
> +svn_error_t *
> +svn_wc_queue_committed3(svn_wc_committed_queue_t *queue,
> + const char *path,
> + svn_boolean_t recurse,
> + const apr_array_header_t *wcprop_changes,
> + svn_boolean_t remove_lock,
> + svn_boolean_t remove_changelist,
> + const svn_checksum_t *checksum,
> + apr_pool_t *scratch_pool);
> +
> +/** @see svn_wc_queue_committed3()
> + *
> + * @a adm_access is unused.
> + *
> * @since New in 1.6.
> + *
> + * @deprecated Provided for backwards compatibility with the 1.6 API.
> */
> svn_error_t *
> svn_wc_queue_committed2(svn_wc_committed_queue_t *queue,
> @@ -4805,11 +4823,23 @@ svn_wc_queue_committed(svn_wc_committed_
> * @a rev_date and @a rev_author are the (server-side) date and author
> * of the new revision; one or both may be @c NULL.
> *
> - * @a adm_access must be associated with all affected directories, and
> - * must hold a write lock in each one.
> + * @since New in 1.7.
> + */
> +svn_error_t *
> +svn_wc_process_committed_queue2(svn_wc_committed_queue_t *queue,
> + svn_wc_context_t *wc_ctx,
> + svn_revnum_t new_revnum,
> + const char *rev_date,
> + const char *rev_author,
> + apr_pool_t *pool);
> +
> +/** @see svn_wc_process_committed_queue2()
> *
> * @since New in 1.5.
> + *
> + * @deprecated Provided for backwards compatibility with the 1.5 API.
> */
> +SVN_DEPRECATED
> svn_error_t *
> svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue,
> svn_wc_adm_access_t *adm_access,
>
[...]
Received on 2010-03-09 16:45:50 CET

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