You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/05/10 18:42:06 UTC
svn commit: r1336785 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/copy.c libsvn_wc/adm_files.c
Author: philip
Date: Thu May 10 16:42:05 2012
New Revision: 1336785
URL: http://svn.apache.org/viewvc?rev=1336785&view=rev
Log:
* subversion/include/private/svn_wc_private.h
* subversion/libsvn_wc/adm_files.c
(svn_wc__get_tmpdir): Rename parameter.
* subversion/libsvn_client/copy.c
(repos_to_wc_copy_single): Tweak comment.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1336785&r1=1336784&r2=1336785&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu May 10 16:42:05 2012
@@ -1036,11 +1036,11 @@ svn_wc__rename_wc(svn_wc_context_t *wc_c
/* 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. */
+ the working copy indicated by WRI_ABSPATH. */
svn_error_t *
svn_wc__get_tmpdir(const char **tmpdir_abspath,
svn_wc_context_t *wc_ctx,
- const char *local_abspath,
+ const char *wri_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1336785&r1=1336784&r2=1336785&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu May 10 16:42:05 2012
@@ -1477,9 +1477,7 @@ repos_to_wc_copy_single(svn_client__copy
svn_boolean_t sleep_needed = FALSE;
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.) */
+ /* Find a temporary location in which to check out the copy source. */
SVN_ERR(svn_wc__get_tmpdir(&tmpdir_abspath, ctx->wc_ctx, dst_abspath,
pool, pool));
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1336785&r1=1336784&r2=1336785&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Thu May 10 16:42:05 2012
@@ -638,12 +638,12 @@ svn_wc_create_tmp_file2(apr_file_t **fp,
svn_error_t *
svn_wc__get_tmpdir(const char **tmpdir_abspath,
svn_wc_context_t *wc_ctx,
- const char *local_abspath,
+ const char *wri_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
SVN_ERR(svn_wc__db_temp_wcroot_tempdir(tmpdir_abspath,
- wc_ctx->db, local_abspath,
+ wc_ctx->db, wri_abspath,
result_pool, scratch_pool));
return SVN_NO_ERROR;
}