You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/09/19 12:13:15 UTC
svn commit: r1626169 -
/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
Author: julianfoad
Date: Fri Sep 19 10:13:15 2014
New Revision: 1626169
URL: http://svn.apache.org/r1626169
Log:
On the 'move-tracking-2' branch: A follow-up fix after r1626023.
* subversion/libsvn_ra_local/ra_plugin.c
(fetch_func): Adjust to use a stringbuf for file content.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c?rev=1626169&r1=1626168&r2=1626169&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c Fri Sep 19 10:13:15 2014
@@ -917,7 +917,7 @@ typedef struct fetch_baton_t
static svn_error_t *
fetch_func(svn_node_kind_t *kind_p,
apr_hash_t **props_p,
- const char **filename_p,
+ svn_stringbuf_t **file_text,
void *baton,
const char *repos_relpath,
svn_revnum_t revision,
@@ -939,18 +939,17 @@ fetch_func(svn_node_kind_t *kind_p,
*kind_p = kind;
}
- if (props_p || filename_p)
+ if (props_p || file_text)
{
if (kind == svn_node_file)
{
svn_stream_t *fstream = NULL;
svn_error_t *err;
- if (filename_p)
+ if (file_text)
{
- SVN_ERR(svn_stream_open_unique(&fstream, filename_p, NULL,
- svn_io_file_del_on_pool_cleanup,
- result_pool, scratch_pool));
+ *file_text = svn_stringbuf_create_empty(result_pool);
+ fstream = svn_stream_from_stringbuf(*file_text, scratch_pool);
}
err = svn_ra_local__get_file(fb->session, session_relpath, revision,
fstream, NULL /*fetched_rev*/,