On the 'pristines-on-demand-on-mwf' branch: Rename "hydrate callback" to
a "fetch callback".
Our callbacks currently only fetch the contents, whereas hydrating is a
composite operation that involves fetching the contents *and* marking the
pristine as hydrated in the working copy. So let's use a more appropriate
name for them.
* subversion/include/private/svn_wc_private.h
(svn_wc__textbase_hydrate_cb_t): Rename …
(svn_wc__textbase_fetch_cb_t): …to this.
(svn_wc__textbase_sync): Rename `hydrate_callback` and `hydrate_baton`
to `fetch_callback` and `fetch_baton` respectively.
* subversion/libsvn_client/textbase.c
(textbase_hydrate_baton_t, textbase_hydrate_cb): Rename …
(textbase_fetch_baton_t, textbase_fetch_cb): …to this.
(svn_client__textbase_sync): Use new names. Rename `baton` to `fetch_baton`.
* subversion/libsvn_wc/textbase.c
(textbase_hydrate_cb): Rename …
(textbase_fetch_cb): …to this.
(textbase_sync_baton_t, svn_wc__textbase_sync): Use new names.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_textbase_hydrate_cb_t): Rename …
(svn_wc__db_textbase_fetch_cb_t): …to this.
(svn_wc__db_textbase_sync): Rename `hydrate_callback` and `hydrate_baton`
to `fetch_callback` and `fetch_baton` respectively.
* subversion/libsvn_wc/wc_db_textbase.c
(textbase_hydrate, svn_wc__db_textbase_sync): Use new names.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/pristines-on-demand-on-mwf@1905659 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/include/private/svn_wc_private.h b/subversion/include/private/svn_wc_private.h
index 0ba4c57..449970a 100644
--- a/subversion/include/private/svn_wc_private.h
+++ b/subversion/include/private/svn_wc_private.h
@@ -2323,7 +2323,7 @@
/* The callback invoked by svn_wc__textbase_sync() to fetch the text-base
contents identified by REPOS_ROOT_URL, REPOS_RELPATH and REVISION. */
-typedef svn_error_t *(*svn_wc__textbase_hydrate_cb_t)(
+typedef svn_error_t *(*svn_wc__textbase_fetch_cb_t)(
void *baton,
const char *repos_root_url,
const char *repos_relpath,
@@ -2335,15 +2335,15 @@
/* Synchronize the state of the text-base contents for the LOCAL_ABSPATH tree.
If ALLOW_HYDRATE is true, fetch the required but missing text-base contents
- using the provided HYDRATE_CALLBACK and HYDRATE_BATON. If ALLOW_DEHYDRATE
+ using the provided FETCH_CALLBACK and FETCH_BATON. If ALLOW_DEHYDRATE
is true, remove the on disk text-base contents that is not required. */
svn_error_t *
svn_wc__textbase_sync(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_boolean_t allow_hydrate,
svn_boolean_t allow_dehydrate,
- svn_wc__textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
diff --git a/subversion/libsvn_client/textbase.c b/subversion/libsvn_client/textbase.c
index 0d566b6..5932971 100644
--- a/subversion/libsvn_client/textbase.c
+++ b/subversion/libsvn_client/textbase.c
@@ -27,27 +27,27 @@
#include "client.h"
-/* A baton for use with textbase_hydrate_cb(). */
-typedef struct textbase_hydrate_baton_t
+/* A baton for use with textbase_fetch_cb(). */
+typedef struct textbase_fetch_baton_t
{
apr_pool_t *result_pool;
const char *base_abspath;
svn_client_ctx_t *ctx;
svn_ra_session_t *ra_session;
-} textbase_hydrate_baton_t;
+} textbase_fetch_baton_t;
-/* Implements svn_wc__textbase_hydrate_cb_t. */
+/* Implements svn_wc__textbase_fetch_cb_t. */
static svn_error_t *
-textbase_hydrate_cb(void *baton,
- const char *repos_root_url,
- const char *repos_relpath,
- svn_revnum_t revision,
- svn_stream_t *contents,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool)
+textbase_fetch_cb(void *baton,
+ const char *repos_root_url,
+ const char *repos_relpath,
+ svn_revnum_t revision,
+ svn_stream_t *contents,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool)
{
- struct textbase_hydrate_baton_t *b = baton;
+ struct textbase_fetch_baton_t *b = baton;
const char *url;
const char *old_url;
@@ -93,7 +93,7 @@
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- textbase_hydrate_baton_t baton = {0};
+ textbase_fetch_baton_t fetch_baton = {0};
const char *old_session_url = NULL;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -102,13 +102,13 @@
If that's the case, use the result pool. Otherwise, the session
is temporary, so use the scratch pool. */
if (ra_session_p)
- baton.result_pool = result_pool;
+ fetch_baton.result_pool = result_pool;
else
- baton.result_pool = scratch_pool;
+ fetch_baton.result_pool = scratch_pool;
- baton.base_abspath = local_abspath;
- baton.ctx = ctx;
- baton.ra_session = ra_session;
+ fetch_baton.base_abspath = local_abspath;
+ fetch_baton.ctx = ctx;
+ fetch_baton.ra_session = ra_session;
if (ctx->notify_func2 && allow_hydrate)
{
@@ -123,7 +123,7 @@
SVN_ERR(svn_wc__textbase_sync(ctx->wc_ctx, local_abspath,
allow_hydrate, allow_dehydrate,
- textbase_hydrate_cb, &baton,
+ textbase_fetch_cb, &fetch_baton,
ctx->cancel_func, ctx->cancel_baton,
scratch_pool));
@@ -139,7 +139,7 @@
}
if (ra_session_p)
- *ra_session_p = baton.ra_session;
+ *ra_session_p = fetch_baton.ra_session;
return SVN_NO_ERROR;
}
diff --git a/subversion/libsvn_wc/textbase.c b/subversion/libsvn_wc/textbase.c
index cbde676..3585def 100644
--- a/subversion/libsvn_wc/textbase.c
+++ b/subversion/libsvn_wc/textbase.c
@@ -460,8 +460,8 @@
typedef struct textbase_sync_baton_t
{
svn_wc__db_t *db;
- svn_wc__textbase_hydrate_cb_t hydrate_callback;
- void *hydrate_baton;
+ svn_wc__textbase_fetch_cb_t fetch_callback;
+ void *fetch_baton;
} textbase_sync_baton_t;
/* Decide whether the text base should be referenced (or "pinned")
@@ -508,22 +508,22 @@
return SVN_NO_ERROR;
}
-/* Implements svn_wc__db_textbase_hydrate_cb_t. */
+/* Implements svn_wc__db_textbase_fetch_cb_t. */
static svn_error_t *
-textbase_hydrate_cb(void *baton,
- const char *repos_root_url,
- const char *repos_relpath,
- svn_revnum_t revision,
- svn_stream_t *contents,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool)
+textbase_fetch_cb(void *baton,
+ const char *repos_root_url,
+ const char *repos_relpath,
+ svn_revnum_t revision,
+ svn_stream_t *contents,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool)
{
textbase_sync_baton_t *b = baton;
- SVN_ERR(b->hydrate_callback(b->hydrate_baton, repos_root_url,
- repos_relpath, revision, contents,
- cancel_func, cancel_baton, scratch_pool));
+ SVN_ERR(b->fetch_callback(b->fetch_baton, repos_root_url,
+ repos_relpath, revision, contents,
+ cancel_func, cancel_baton, scratch_pool));
return SVN_NO_ERROR;
}
@@ -533,8 +533,8 @@
const char *local_abspath,
svn_boolean_t allow_hydrate,
svn_boolean_t allow_dehydrate,
- svn_wc__textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool)
@@ -550,8 +550,8 @@
return SVN_NO_ERROR;
baton.db = wc_ctx->db;
- baton.hydrate_callback = hydrate_callback;
- baton.hydrate_baton = hydrate_baton;
+ baton.fetch_callback = fetch_callback;
+ baton.fetch_baton = fetch_baton;
SVN_ERR(svn_wc__db_textbase_walk(wc_ctx->db, local_abspath,
textbase_walk_cb, &baton,
@@ -560,7 +560,7 @@
SVN_ERR(svn_wc__db_textbase_sync(wc_ctx->db, local_abspath,
allow_hydrate, allow_dehydrate,
- textbase_hydrate_cb, &baton,
+ textbase_fetch_cb, &baton,
cancel_func, cancel_baton,
scratch_pool));
diff --git a/subversion/libsvn_wc/wc_db.h b/subversion/libsvn_wc/wc_db.h
index 44d1b4f..6bab484 100644
--- a/subversion/libsvn_wc/wc_db.h
+++ b/subversion/libsvn_wc/wc_db.h
@@ -3148,7 +3148,7 @@
apr_pool_t *scratch_pool);
/* The callback invoked by svn_wc__db_textbase_sync(). */
-typedef svn_error_t * (*svn_wc__db_textbase_hydrate_cb_t)(
+typedef svn_error_t * (*svn_wc__db_textbase_fetch_cb_t)(
void *baton,
const char *repos_root_url,
const char *repos_relpath,
@@ -3161,7 +3161,7 @@
/* Synchronize the state of the text-bases in DB.
If ALLOW_HYDRATE is true, fetch the referenced but missing text-base
- contents using the provided HYDRATE_CALLBACK and HYDRATE_BATON.
+ contents using the provided FETCH_CALLBACK and FETCH_BATON.
If ALLOW_DEHYDRATE is true, remove the on disk text-base contents
that is no longer referenced.
*/
@@ -3170,8 +3170,8 @@
const char *local_abspath,
svn_boolean_t allow_hydrate,
svn_boolean_t allow_dehydrate,
- svn_wc__db_textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__db_textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
diff --git a/subversion/libsvn_wc/wc_db_textbase.c b/subversion/libsvn_wc/wc_db_textbase.c
index ac4f3b0..e687595 100644
--- a/subversion/libsvn_wc/wc_db_textbase.c
+++ b/subversion/libsvn_wc/wc_db_textbase.c
@@ -161,8 +161,8 @@
static svn_error_t *
textbase_hydrate(svn_wc__db_wcroot_t *wcroot,
- svn_wc__db_textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__db_textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const svn_checksum_t *checksum,
@@ -182,11 +182,11 @@
&install_sha1_checksum, &install_md5_checksum,
wcroot, TRUE, scratch_pool, scratch_pool));
- err = hydrate_callback(hydrate_baton, repos_root_url,
- repos_relpath, revision,
- install_stream,
- cancel_func, cancel_baton,
- scratch_pool);
+ err = fetch_callback(fetch_baton, repos_root_url,
+ repos_relpath, revision,
+ install_stream,
+ cancel_func, cancel_baton,
+ scratch_pool);
if (err)
return svn_error_compose_create(err,
svn_wc__db_pristine_install_abort(install_data, scratch_pool));
@@ -217,8 +217,8 @@
const char *local_abspath,
svn_boolean_t allow_hydrate,
svn_boolean_t allow_dehydrate,
- svn_wc__db_textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__db_textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool)
@@ -320,7 +320,7 @@
svn_checksum_to_cstring_display(checksum, iterpool));
}
- err = textbase_hydrate(wcroot, hydrate_callback, hydrate_baton,
+ err = textbase_hydrate(wcroot, fetch_callback, fetch_baton,
cancel_func, cancel_baton, checksum,
repos_root_url, repos_relpath, revision,
iterpool);
