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/30 20:58:25 UTC
svn commit: r1628515 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c
Author: julianfoad
Date: Tue Sep 30 18:58:25 2014
New Revision: 1628515
URL: http://svn.apache.org/r1628515
Log:
On the 'move-tracking-2' branch: A follow-up to r1628497: expose a needed
function.
* subversion/include/private/svn_ra_private.h,
subversion/libsvn_ra/ra_loader.c
(svn_ra_fetch): Expose this function privately, that was called 'fetch'.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h?rev=1628515&r1=1628514&r2=1628515&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h Tue Sep 30 18:58:25 2014
@@ -321,6 +321,20 @@ svn_ra_do_switch4(svn_ra_session_t *sess
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Fetch kind and/or props and/or text.
+ *
+ * Implements svn_editor3__shim_fetch_func_t. */
+svn_error_t *
+svn_ra_fetch(svn_node_kind_t *kind_p,
+ apr_hash_t **props_p,
+ svn_stringbuf_t **file_text,
+ apr_hash_t **children_names,
+ void *baton,
+ const char *repos_relpath,
+ svn_revnum_t revision,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
#ifdef __cplusplus
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1628515&r1=1628514&r2=1628515&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Tue Sep 30 18:58:25 2014
@@ -763,9 +763,8 @@ struct fb_baton {
const char *session_path;
};
-/* Fetch kind and/or props and/or text */
-static svn_error_t *
-fetch(svn_node_kind_t *kind_p,
+svn_error_t *
+svn_ra_fetch(svn_node_kind_t *kind_p,
apr_hash_t **props_p,
svn_stringbuf_t **file_text,
apr_hash_t **children_names,
@@ -869,7 +868,7 @@ svn_error_t *svn_ra_get_commit_editor_ev
&shim_connector,
deditor, dedit_baton,
repos_root_url, base_relpath,
- fetch, fbb,
+ svn_ra_fetch, fbb,
NULL, NULL /*cancel*/,
pool, pool));
}
@@ -909,7 +908,7 @@ svn_error_t *svn_ra_get_commit_editor3(s
fbb->repos_root_url = repos_root_url;
SVN_ERR(svn_editor3__insert_shims(editor, edit_baton, *editor, *edit_baton,
repos_root_url, base_relpath,
- fetch, fbb, pool, pool));
+ svn_ra_fetch, fbb, pool, pool));
}
return SVN_NO_ERROR;