You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/15 16:25:51 UTC
svn commit: r1338720 - in /subversion/branches/1.7.x-issue4153: ./
subversion/libsvn_client/diff.c
Author: stsp
Date: Tue May 15 14:25:50 2012
New Revision: 1338720
URL: http://svn.apache.org/viewvc?rev=1338720&view=rev
Log:
On the 1.7.x-issue4153 branch, merge r1338297 and r1338314 from trunk.
Clean merge without conflicts.
Modified:
subversion/branches/1.7.x-issue4153/ (props changed)
subversion/branches/1.7.x-issue4153/subversion/libsvn_client/diff.c
Propchange: subversion/branches/1.7.x-issue4153/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1338297,1338314
Modified: subversion/branches/1.7.x-issue4153/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/subversion/libsvn_client/diff.c?rev=1338720&r1=1338719&r2=1338720&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/1.7.x-issue4153/subversion/libsvn_client/diff.c Tue May 15 14:25:50 2012
@@ -1859,21 +1859,16 @@ diff_repos_repos_added_or_deleted_file(c
svn_ra_session_t *ra_session,
apr_pool_t *scratch_pool)
{
- apr_file_t *file;
const char *file_abspath;
svn_stream_t *content;
apr_hash_t *prop_hash;
- /* ### There is no way to flush content to disk without access to the bare
- * ### file handle so we re-implement svn_stream_open_unique() here.
- * ### Do we need something like svn_stream_flush()? */
- SVN_ERR(svn_io_open_unique_file3(&file, &file_abspath, NULL,
- svn_io_file_del_on_close,
- scratch_pool, scratch_pool));
- content = svn_stream_from_aprfile2(file, FALSE, scratch_pool);
+ SVN_ERR(svn_stream_open_unique(&content, &file_abspath, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_ra_get_file(ra_session, target, peg_revision, content, NULL,
&prop_hash, scratch_pool));
- SVN_ERR(svn_io_file_flush_to_disk(file, scratch_pool));
+ SVN_ERR(svn_stream_close(content));
if (show_deletion)
{
@@ -1899,8 +1894,6 @@ diff_repos_repos_added_or_deleted_file(c
NULL, callback_baton, scratch_pool));
}
- SVN_ERR(svn_stream_close(content));
-
return SVN_NO_ERROR;
}
@@ -1986,7 +1979,7 @@ diff_repos_repos_added_or_deleted_dir(co
callbacks,
callback_baton,
ra_session,
- scratch_pool));
+ iterpool));
}
svn_pool_destroy(iterpool);