Author: breser
Date: Wed Oct 17 01:54:19 2012
New Revision: 1399073
URL: http://svn.apache.org/viewvc?rev=1399073&view=rev
Log:
Rename some variable names so that the commit callback/baton tuple naming is
consistent across our libraries.
This makes SWIG bindings easier to write since a single typemap can support
the usage of callback/baton tuple in the ra/repos and the client libraries.
I went ahead and did svn_ra__use_commit_shim just to help make the code easier
to read by maintaining variable names between public and helper functions.
* subversion/libsvn_ra/deprecated.c
(svn_ra_get_commit_editor2): s/callback/commit_callback/ and
s/callback_baton/commit_baton/
* subversion/libsvn_ra/editor.c
(svn_ra__use_commit_shim): s/callback/commit_callback/ and
s/callback_baton/commit_baton/
* subversion/libsvn_ra/ra_loader.c
(svn_ra_get_commit_editor3): s/callback/commit_callback/ and
s/callback_baton/commit_baton/
* subversion/bindings/swig/include/svn_types.swg
(svn_commit_callback2_t): Remove the duplicated typemap for Perl.
s/callback/commit_callback/ and s/callback_baton/commit_baton/
* subversion/include/svn_repos.h
(svn_repos_get_commit_editor5,svn_repos_get_commit_editor4):
s/callback/commit_callback/ and s/callback_baton/commit_baton/
* subversion/include/svn_ra.h
(svn_ra_get_commit_editor3,svn_ra_get_commit_editor2):
s/callback/commit_callback/ and s/callback_baton/commit_baton/ and fix the
documentation that mentions the arguments to the callback to match what
actually goes to the callback.
* subversion/libsvn_repos/deprecated.c
(svn_repos_get_commit_editor4): s/callback/commit_callback/ and
s/callback_baton/commit_baton/
* subversion/libsvn_repos/commit.c
(svn_repos_get_commit_editor5): s/callback/commit_callback/ and
s/callback_baton/commit_baton/
Modified:
subversion/trunk/subversion/bindings/swig/include/svn_types.swg
subversion/trunk/subversion/include/svn_ra.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_ra/deprecated.c
subversion/trunk/subversion/libsvn_ra/editor.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_repos/commit.c
subversion/trunk/subversion/libsvn_repos/deprecated.c
Modified: subversion/trunk/subversion/bindings/swig/include/svn_types.swg
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_types.swg?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_types.swg Wed Oct 17
01:54:19 2012
@@ -793,10 +793,17 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
Callback: svn_commit_callback2_t
svn_ra get_commit_editor2()
svn_repos_get_commit_editor4()
+ svn_client_mkdir4()
+ svn_client_delete4()
+ svn_client_import4()
+ svn_client_commit5()
+ svn_client_copy6()
+ svn_client_move6()
+ svn_client_propset_remote()
*/
#ifdef SWIGPERL
-%typemap(in) (svn_commit_callback2_t callback, void *callback_baton) {
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton) {
$1 = svn_swig_pl_thunk_commit_callback2;
$2 = (void *)$input;
svn_swig_pl_hold_ref_in_pool (_global_pool, $input);
@@ -804,20 +811,20 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
#endif
#ifdef SWIGRUBY
-%typemap(in) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton)
{
$1 = svn_swig_rb_commit_callback2;
$2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
};
-%typemap(argout) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(argout) (svn_commit_callback2_t commit_callback, void *commit_baton)
{
svn_swig_rb_set_baton($result, (VALUE)$2);
};
#endif
#ifdef SWIGPYTHON
-%typemap(in) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton)
{
$1 = svn_swig_py_commit_callback2;
$2 = (void *)$input;
@@ -825,29 +832,6 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
#endif
/* -----------------------------------------------------------------------
- Callback: svn_commit_callback2_t
- svn_client_mkdir4()
- svn_client_delete4()
- svn_client_import4()
- svn_client_commit5()
- svn_client_copy6()
- svn_client_move6()
- svn_client_propset_remote()
-
- A separate typemap is needed here because we used different variable names
- in the client library functions than we used in the ra/repos library
- functions.
-*/
-
-#ifdef SWIGPERL
-%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton) {
- $1 = svn_swig_pl_thunk_commit_callback2;
- $2 = (void *)$input;
- svn_swig_pl_hold_ref_in_pool (_global_pool, $input);
-};
-#endif
-
-/* -----------------------------------------------------------------------
Callback: svn_cancel_func_t
*/
Modified: subversion/trunk/subversion/include/svn_ra.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra.h (original)
+++ subversion/trunk/subversion/include/svn_ra.h Wed Oct 17 01:54:19 2012
@@ -874,12 +874,12 @@ svn_ra_rev_prop(svn_ra_session_t *sessio
* or @c SVN_PROP_REVISION_AUTHOR.
*
* Before @c close_edit returns, but after the commit has succeeded,
- * it will invoke @a callback (if non-NULL) with the new revision number,
- * the commit date (as a <tt>const char *</tt>), commit author (as a
- * <tt>const char *</tt>), and @a callback_baton as arguments. If
- * @a callback returns an error, that error will be returned from @c
- * close_edit, otherwise @c close_edit will return successfully
- * (unless it encountered an error before invoking @a callback).
+ * it will invoke @a commit_callback (if non-NULL) with filled-in
+ * #svn_commit_info_t *, @a commit_baton, and @a pool or some subpool
+ * thereof as arguments. If @a commit_callback returns an error, that error
+ * will be returned from @c * close_edit, otherwise @c close_edit will return
+ * successfully (unless it encountered an error before invoking
+ * @a commit_callback).
*
* The callback will not be called if the commit was a no-op
* (i.e. nothing was committed);
@@ -905,8 +905,8 @@ svn_ra_get_commit_editor3(svn_ra_session
const svn_delta_editor_t **editor,
void **edit_baton,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool);
@@ -926,8 +926,8 @@ svn_ra_get_commit_editor2(svn_ra_session
const svn_delta_editor_t **editor,
void **edit_baton,
const char *log_msg,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Oct 17 01:54:19 2012
@@ -1340,14 +1340,14 @@ svn_repos_replay(svn_fs_root_t *root,
*
* Calling @a (*editor)->close_edit completes the commit.
*
- * If @a callback is non-NULL, then before @c close_edit returns (but
+ * If @a commit_callback is non-NULL, then before @c close_edit returns (but
* after the commit has succeeded) @c close_edit will invoke
- * @a callback with a filled-in #svn_commit_info_t *, @a callback_baton,
- * and @a pool or some subpool thereof as arguments. If @a callback
+ * @a commit_callback with a filled-in #svn_commit_info_t *, @a commit_baton,
+ * and @a pool or some subpool thereof as arguments. If @a commit_callback
* returns an error, that error will be returned from @c close_edit,
* otherwise if there was a post-commit hook failure, then that error
* will be returned with code SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED.
- * (Note that prior to Subversion 1.6, @a callback cannot be NULL; if
+ * (Note that prior to Subversion 1.6, @a commit_callback cannot be NULL; if
* you don't need a callback, pass a dummy function.)
*
* Calling @a (*editor)->abort_edit aborts the commit, and will also
@@ -1368,8 +1368,8 @@ svn_repos_get_commit_editor5(const svn_d
const char *repos_url,
const char *base_path,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
svn_repos_authz_callback_t authz_callback,
void *authz_baton,
apr_pool_t *pool);
@@ -1394,8 +1394,8 @@ svn_repos_get_commit_editor4(const svn_d
const char *base_path,
const char *user,
const char *log_msg,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
svn_repos_authz_callback_t authz_callback,
void *authz_baton,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_ra/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/deprecated.c?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_ra/deprecated.c Wed Oct 17 01:54:19 2012
@@ -209,8 +209,8 @@ svn_error_t *svn_ra_get_commit_editor2(s
const svn_delta_editor_t **editor,
void **edit_baton,
const char *log_msg,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool)
@@ -221,7 +221,7 @@ svn_error_t *svn_ra_get_commit_editor2(s
APR_HASH_KEY_STRING,
svn_string_create(log_msg, pool));
return svn_ra_get_commit_editor3(session, editor, edit_baton, revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
lock_tokens, keep_locks, pool);
}
Modified: subversion/trunk/subversion/libsvn_ra/editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/editor.c?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/editor.c (original)
+++ subversion/trunk/subversion/libsvn_ra/editor.c Wed Oct 17 01:54:19 2012
@@ -77,8 +77,8 @@ svn_error_t *
svn_ra__use_commit_shim(svn_editor_t **editor,
svn_ra_session_t *session,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
svn_ra__provide_base_cb_t provide_base_cb,
@@ -108,7 +108,7 @@ svn_ra__use_commit_shim(svn_editor_t **e
/* Fetch the RA provider's Ev1 commit editor. */
SVN_ERR(session->vtable->get_commit_editor(session, &deditor, &dedit_baton,
revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
lock_tokens, keep_locks,
result_pool));
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Wed Oct 17 01:54:19 2012
@@ -706,19 +706,19 @@ svn_error_t *svn_ra_get_commit_editor3(s
const svn_delta_editor_t **editor,
void **edit_baton,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool)
{
- remap_commit_callback(&callback, &callback_baton,
- session, callback, callback_baton,
+ remap_commit_callback(&commit_callback, &commit_baton,
+ session, commit_callback, commit_baton,
pool);
return session->vtable->get_commit_editor(session, editor, edit_baton,
revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
lock_tokens, keep_locks, pool);
}
@@ -1280,8 +1280,8 @@ svn_error_t *
svn_ra__get_commit_ev2(svn_editor_t **editor,
svn_ra_session_t *session,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
svn_ra__provide_base_cb_t provide_base_cb,
@@ -1299,15 +1299,15 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
default shim over the normal commit editor. */
/* Remap for RA layers exposing Ev1. */
- remap_commit_callback(&callback, &callback_baton,
- session, callback, callback_baton,
+ remap_commit_callback(&commit_callback, &commit_baton,
+ session, commit_callback, commit_baton,
result_pool);
return svn_error_trace(svn_ra__use_commit_shim(
editor,
session,
revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
lock_tokens,
keep_locks,
provide_base_cb,
@@ -1325,7 +1325,7 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
editor,
session,
revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
lock_tokens,
keep_locks,
provide_base_cb,
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Oct 17 01:54:19 2012
@@ -921,8 +921,8 @@ svn_repos_get_commit_editor5(const svn_d
const char *repos_url,
const char *base_path,
apr_hash_t *revprop_table,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
svn_repos_authz_callback_t authz_callback,
void *authz_baton,
apr_pool_t *pool)
@@ -967,8 +967,8 @@ svn_repos_get_commit_editor5(const svn_d
/* Set up the edit baton. */
eb->pool = subpool;
eb->revprop_table = svn_prop_hash_dup(revprop_table, subpool);
- eb->commit_callback = callback;
- eb->commit_callback_baton = callback_baton;
+ eb->commit_callback = commit_callback;
+ eb->commit_callback_baton = commit_baton;
eb->authz_callback = authz_callback;
eb->authz_baton = authz_baton;
eb->base_path = svn_fspath__canonicalize(base_path, subpool);
Modified: subversion/trunk/subversion/libsvn_repos/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/deprecated.c?rev=1399073&r1=1399072&r2=1399073&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_repos/deprecated.c Wed Oct 17 01:54:19
2012
@@ -48,8 +48,8 @@ svn_repos_get_commit_editor4(const svn_d
const char *base_path,
const char *user,
const char *log_msg,
- svn_commit_callback2_t callback,
- void *callback_baton,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
svn_repos_authz_callback_t authz_callback,
void *authz_baton,
apr_pool_t *pool)
@@ -65,7 +65,7 @@ svn_repos_get_commit_editor4(const svn_d
svn_string_create(log_msg, pool));
return svn_repos_get_commit_editor5(editor, edit_baton, repos, txn,
repos_url, base_path, revprop_table,
- callback, callback_baton,
+ commit_callback, commit_baton,
authz_callback, authz_baton, pool);
}
