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

Re: svn commit: r1336442 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/copy.c libsvn_wc/adm_files.c

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 9 May 2012 23:43:32 -0400

On Wed, May 9, 2012 at 7:07 PM, <philip_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed May †9 23:07:40 2012
> @@ -1034,6 +1034,16 @@ svn_wc__rename_wc(svn_wc_context_t *wc_c
> † † † † † † † † † const char *dst_abspath,
> † † † † † † † † † apr_pool_t *scratch_pool);
>
> +/* Set *TMPDIR_ABSPATH to a directory that is suitable for temporary
> + † files which may need to be moved (atomically and same-device) into
> + † the working copy indicated by LOCAL_ABSPATH. †*/
> +svn_error_t *
> +svn_wc__get_tmpdir(const char **tmpdir_abspath,
> + † † † † † † † † † svn_wc_context_t *wc_ctx,
> + † † † † † † † † † const char *local_abspath,
> + † † † † † † † † † apr_pool_t *result_pool,
> + † † † † † † † † † apr_pool_t *scratch_pool);

These should be WRI_ABSPATH for consistent variable naming (your
docstring already uses the term "indicator").

>...
> +++ subversion/trunk/subversion/libsvn_client/copy.c Wed May †9 23:07:40 2012
> @@ -1475,13 +1475,16 @@ repos_to_wc_copy_single(svn_client__copy
> † if (pair->src_kind == svn_node_dir)
> † † {
> † † † svn_boolean_t sleep_needed = FALSE;
> - † † †const char *tmp_abspath;
> + † † †const char *tmpdir_abspath, *tmp_abspath;
>
> † † † /* Find a temporary location in which to check out the copy source.
> † † † †* (This function is deprecated, but we intend to replace this whole
> † † † †* code path with something else.) */
> - † † †SVN_ERR(svn_wc_create_tmp_file2(NULL, &tmp_abspath, dst_abspath,
> - † † † † † † † † † † † † † † † † † † †svn_io_file_del_on_close, pool));
> + † † †SVN_ERR(svn_wc__get_tmpdir(&tmpdir_abspath, ctx->wc_ctx, dst_abspath,
> + † † † † † † † † † † † † † † † † pool, pool));

The comment is now out of date .... __get_tmpdir() is not deprecated.

>...

Cheers,
-g
Received on 2012-05-10 05:44:07 CEST

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