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

Re: svn commit: r920336 - in /subversion/trunk/subversion/libsvn_client: client.h commit.c commit_util.c copy.c

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Tue, 09 Mar 2010 12:00:57 +0000

On Mon, 2010-03-08, philip_at_apache.org wrote:
> Author: philip
> Date: Mon Mar 8 14:35:42 2010
> New Revision: 920336
>
> URL: http://svn.apache.org/viewvc?rev=920336&view=rev
> Log:
> Remove access baton from svn_client__harvest_committables. Explicitly
> use absolute paths in svn_client__copy_pair_t (they were mostly absolute
> already).
[...]

> Modified: subversion/trunk/subversion/libsvn_client/client.h
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=920336&r1=920335&r2=920336&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/client.h (original)
> +++ subversion/trunk/subversion/libsvn_client/client.h Mon Mar 8 14:35:42 2010
> @@ -730,12 +730,9 @@
> */
> typedef struct
> {
> - /* The source path or url. */
> + /* The absolute source path or url. */
> const char *src;
>
> - /* The absolute path of the source. */
> - const char *src_abs;
> -
> /* The base name of the object. It should be the same for both src
> and dst. */
> const char *base_name;
> @@ -756,11 +753,11 @@
> /* The source revision number. */
> svn_revnum_t src_revnum;
>
> - /* The destination path or url */
> + /* The absolute destination path or url */
> const char *dst;
>
> - /* The destination's parent path */
> - const char *dst_parent;
> + /* The absolute destination's parent path */
> + const char *dst_parent_abspath;

"The absolute path or URL of the destination's parent" ?

> } svn_client__copy_pair_t;
>
> /* ---------------------------------------------------------------- */
> @@ -871,7 +868,7 @@
> svn_error_t *
> svn_client__harvest_committables(apr_hash_t **committables,
> apr_hash_t **lock_tokens,
> - svn_wc_adm_access_t *parent_dir,
> + const char *dir_abspath,

Please could you update the doc string accordingly.

> apr_array_header_t *targets,
> svn_depth_t depth,
> svn_boolean_t just_locked,
> @@ -880,8 +877,8 @@
> apr_pool_t *pool);
>

[...]
> Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=920336&r1=920335&r2=920336&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
> +++ subversion/trunk/subversion/libsvn_client/commit_util.c Mon Mar 8 14:35:42 2010
> @@ -357,7 +357,7 @@
> static svn_error_t *
> harvest_committables(apr_hash_t *committables,
> apr_hash_t *lock_tokens,
> - const char *path,
> + const char *local_abspath,

And here.

> const char *url,
> const char *copyfrom_url,
> const svn_wc_entry_t *entry,
[...]
> @@ -925,7 +922,7 @@
> svn_error_t *
> svn_client__harvest_committables(apr_hash_t **committables,
> apr_hash_t **lock_tokens,
> - svn_wc_adm_access_t *parent_adm,
> + const char *dir_abspath,
> apr_array_header_t *targets,
> svn_depth_t depth,
> svn_boolean_t just_locked,
[...]

- Julian
Received on 2010-03-09 13:01:31 CET

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