Author: hwright
Date: Tue Jan 17 04:18:56 2012
New Revision: 1232294
URL: http://svn.apache.org/viewvc?rev=1232294&view=rev
Log:
Ev2 shims: When fetching the base file in the working copy, just use the
pristine, rather than creating a separate copy of it.
* subversion/libsvn_wc/util.c
(svn_wc__fetch_base_func): Use the pristine filename, if we have one.
Modified:
subversion/trunk/subversion/libsvn_wc/util.c
Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=1232294&r1=1232293&r2=1232294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Tue Jan 17 04:18:56 2012
@@ -595,9 +595,6 @@ svn_wc__fetch_base_func(const char **fil
apr_pool_t *scratch_pool)
{
struct svn_wc__shim_fetch_baton_t *sfb = baton;
- svn_stream_t *contents;
- svn_stream_t *file_stream;
- const char *tmp_filename;
const svn_checksum_t *checksum;
svn_error_t *err;
const char *local_abspath = svn_dirent_join(sfb->base_abspath, path,
@@ -622,15 +619,8 @@ svn_wc__fetch_base_func(const char **fil
return SVN_NO_ERROR;
}
- SVN_ERR(svn_wc__db_pristine_read(&contents, NULL, sfb->db, local_abspath,
- checksum, scratch_pool, scratch_pool));
-
- SVN_ERR(svn_stream_open_unique(&file_stream, &tmp_filename, NULL,
- svn_io_file_del_on_pool_cleanup,
- scratch_pool, scratch_pool));
- SVN_ERR(svn_stream_copy3(contents, file_stream, NULL, NULL, scratch_pool));
-
- *filename = apr_pstrdup(result_pool, tmp_filename);
+ SVN_ERR(svn_wc__db_pristine_get_path(filename, sfb->db, local_abspath,
+ checksum, scratch_pool, scratch_pool));
return SVN_NO_ERROR;
}
