You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/02/21 06:44:30 UTC
svn commit: r1291608 - in /subversion/trunk/subversion/libsvn_ra_serf:
commit.c ra_serf.h serf.c util.c
Author: hwright
Date: Tue Feb 21 05:44:30 2012
New Revision: 1291608
URL: http://svn.apache.org/viewvc?rev=1291608&view=rev
Log:
Fix running over ra_serf in the wake of r1291593 by providing a shim callback
registration function for same.
* subversion/libsvn_ra_serf/util.c
(svn_ra_serf__register_editor_shim_callbacks): New.
* subversion/libsvn_ra_serf/serf.c
(serf_vtable): Add the new callback to the vtable.
* subversion/libsvn_ra_serf/commit.c
(svn_ra_serf__get_commit_editor): Use the stashed shim callbacks.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__session_t): Add the shim_callbacks member.
(svn_ra_serf__register_editor_shim_callbacks): New.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1291608&r1=1291607&r2=1291608&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Tue Feb 21 05:44:30 2012
@@ -2319,8 +2319,6 @@ svn_ra_serf__get_commit_editor(svn_ra_se
svn_delta_editor_t *editor;
commit_context_t *ctx;
apr_hash_index_t *hi;
- svn_delta_shim_callbacks_t *shim_callbacks =
- svn_delta_shim_callbacks_default(pool);
ctx = apr_pcalloc(pool, sizeof(*ctx));
@@ -2368,7 +2366,8 @@ svn_ra_serf__get_commit_editor(svn_ra_se
*edit_baton = ctx;
SVN_ERR(svn_editor__insert_shims(ret_editor, edit_baton, *ret_editor,
- *edit_baton, shim_callbacks, pool, pool));
+ *edit_baton, session->shim_callbacks,
+ pool, pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1291608&r1=1291607&r2=1291608&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Tue Feb 21 05:44:30 2012
@@ -148,6 +148,9 @@ struct svn_ra_serf__session_t {
svn_cancel_func_t cancel_func;
void *cancel_baton;
+ /* Ev2 shim callbacks */
+ svn_delta_shim_callbacks_t *shim_callbacks;
+
/* Error that we've received but not yet returned upstream. */
svn_error_t *pending_error;
@@ -1454,6 +1457,11 @@ svn_ra_serf__error_on_status(int status_
const char *path,
const char *location);
+svn_error_t *
+svn_ra_serf__register_editor_shim_callbacks(svn_ra_session_t *session,
+ svn_delta_shim_callbacks_t *callbacks);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1291608&r1=1291607&r2=1291608&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Tue Feb 21 05:44:30 2012
@@ -1157,7 +1157,8 @@ static const svn_ra__vtable_t serf_vtabl
svn_ra_serf__replay,
svn_ra_serf__has_capability,
svn_ra_serf__replay_range,
- svn_ra_serf__get_deleted_rev
+ svn_ra_serf__get_deleted_rev,
+ svn_ra_serf__register_editor_shim_callbacks
};
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1291608&r1=1291607&r2=1291608&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Tue Feb 21 05:44:30 2012
@@ -38,6 +38,7 @@
#include "svn_private_config.h"
#include "svn_string.h"
#include "svn_xml.h"
+#include "../libsvn_ra/ra_loader.h"
#include "private/svn_dep_compat.h"
#include "private/svn_fspath.h"
@@ -2466,3 +2467,13 @@ svn_ra_serf__error_on_status(int status_
return SVN_NO_ERROR;
}
+
+svn_error_t *
+svn_ra_serf__register_editor_shim_callbacks(svn_ra_session_t *ra_session,
+ svn_delta_shim_callbacks_t *callbacks)
+{
+ svn_ra_serf__session_t *session = ra_session->priv;
+
+ session->shim_callbacks = callbacks;
+ return SVN_NO_ERROR;
+}