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 2015/11/13 08:45:05 UTC
svn commit: r1714159 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c
Author: julianfoad
Date: Fri Nov 13 07:45:04 2015
New Revision: 1714159
URL: http://svn.apache.org/viewvc?rev=1714159&view=rev
Log:
On the 'move-tracking-2' branch: A follow-up to the renames of r1713980.
* subversion/include/private/svn_ra_private.h
(svn_ra_fetch): Update the doc string to track a previous rename.
* subversion/libsvn_ra/ra_loader.c
(svn_branch_repos_fetch_info,
svn_branch_get_mutable_state,
svn_ra_load_branching_state): Rename, removing the 'svn_prefix' as these
are local (static) functions, and update the callers.
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=1714159&r1=1714158&r2=1714159&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 Fri Nov 13 07:45:04 2015
@@ -367,7 +367,7 @@ svn_ra_do_switch4(svn_ra_session_t *sess
/* Fetch kind and/or props and/or text.
*
- * Implements svn_branch_compat__shim_fetch_func_t. */
+ * Implements svn_branch__compat_fetch_func_t. */
svn_error_t *
svn_ra_fetch(svn_node_kind_t *kind_p,
apr_hash_t **props_p,
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=1714159&r1=1714158&r2=1714159&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 Fri Nov 13 07:45:04 2015
@@ -679,13 +679,13 @@ write_rev_prop(svn_ra_session_t *ra_sess
* branch-tracking metadata from the repository into it.
*/
static svn_error_t *
-svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
- svn_branch__repos_t *repos,
- svn_ra_session_t *ra_session,
- const char *branch_info_dir,
- svn_revnum_t revision,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+branch_revision_fetch_info(svn_branch__txn_t **txn_p,
+ svn_branch__repos_t *repos,
+ svn_ra_session_t *ra_session,
+ const char *branch_info_dir,
+ svn_revnum_t revision,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_string_t *value;
svn_stream_t *stream;
@@ -774,13 +774,13 @@ txn_fetch_payloads(svn_branch__txn_t *tx
* branch-tracking metadata from the repository into it.
*/
static svn_error_t *
-svn_branch_repos_fetch_info(svn_branch__repos_t **repos_p,
- svn_ra_session_t *ra_session,
- const char *branch_info_dir,
- svn_branch__compat_fetch_func_t fetch_func,
- void *fetch_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+branch_repos_fetch_info(svn_branch__repos_t **repos_p,
+ svn_ra_session_t *ra_session,
+ const char *branch_info_dir,
+ svn_branch__compat_fetch_func_t fetch_func,
+ void *fetch_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_branch__repos_t *repos
= svn_branch__repos_create(result_pool);
@@ -793,10 +793,10 @@ svn_branch_repos_fetch_info(svn_branch__
{
svn_branch__txn_t *txn;
- SVN_ERR(svn_branch_revision_fetch_info(&txn,
- repos, ra_session, branch_info_dir,
- r,
- result_pool, scratch_pool));
+ SVN_ERR(branch_revision_fetch_info(&txn,
+ repos, ra_session, branch_info_dir,
+ r,
+ result_pool, scratch_pool));
SVN_ERR(svn_branch__repos_add_revision(repos, txn));
SVN_ERR(txn_fetch_payloads(txn, fetch_func, fetch_baton,
result_pool, scratch_pool));
@@ -809,15 +809,15 @@ svn_branch_repos_fetch_info(svn_branch__
/* Return a mutable state based on revision BASE_REVISION in REPOS.
*/
static svn_error_t *
-svn_branch_get_mutable_state(svn_branch__txn_t **txn_p,
- svn_branch__repos_t *repos,
- svn_ra_session_t *ra_session,
- const char *branch_info_dir,
- svn_revnum_t base_revision,
- svn_branch__compat_fetch_func_t fetch_func,
- void *fetch_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+branch_get_mutable_state(svn_branch__txn_t **txn_p,
+ svn_branch__repos_t *repos,
+ svn_ra_session_t *ra_session,
+ const char *branch_info_dir,
+ svn_revnum_t base_revision,
+ svn_branch__compat_fetch_func_t fetch_func,
+ void *fetch_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_branch__txn_t *txn;
apr_array_header_t *branches;
@@ -825,10 +825,10 @@ svn_branch_get_mutable_state(svn_branch_
SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(base_revision));
- SVN_ERR(svn_branch_revision_fetch_info(&txn,
- repos, ra_session, branch_info_dir,
- base_revision,
- result_pool, scratch_pool));
+ SVN_ERR(branch_revision_fetch_info(&txn,
+ repos, ra_session, branch_info_dir,
+ base_revision,
+ result_pool, scratch_pool));
SVN_ERR_ASSERT(txn->rev == base_revision);
SVN_ERR(txn_fetch_payloads(txn, fetch_func, fetch_baton,
result_pool, scratch_pool));
@@ -1047,15 +1047,15 @@ svn_ra_load_branching_state(svn_branch__
*fetch_func = svn_ra_fetch;
*fetch_baton = fbb;
- SVN_ERR(svn_branch_repos_fetch_info(&repos,
- session, branch_info_dir,
- *fetch_func, *fetch_baton,
- result_pool, scratch_pool));
- SVN_ERR(svn_branch_get_mutable_state(branching_txn_p,
- repos, session, branch_info_dir,
- base_revision,
- *fetch_func, *fetch_baton,
- result_pool, scratch_pool));
+ SVN_ERR(branch_repos_fetch_info(&repos,
+ session, branch_info_dir,
+ *fetch_func, *fetch_baton,
+ result_pool, scratch_pool));
+ SVN_ERR(branch_get_mutable_state(branching_txn_p,
+ repos, session, branch_info_dir,
+ base_revision,
+ *fetch_func, *fetch_baton,
+ result_pool, scratch_pool));
return SVN_NO_ERROR;
}