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 03:42:56 UTC
svn commit: r1291562 - in /subversion/trunk/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h
Author: hwright
Date: Tue Feb 21 02:42:56 2012
New Revision: 1291562
URL: http://svn.apache.org/viewvc?rev=1291562&view=rev
Log:
Ev2 shims: Add some functionality to allow presenting the appropriate shims
to the various ra editors. None of them actually implement the new vtable
method yet, so a call to it would promptly segfault (as opposed to the
assert we currently throw).
* subversion/include/private/svn_ra_private.h
(svn_ra__register_editor_shim_callbacks): New.
* subversion/libsvn_ra/ra_loader.c
(svn_ra__register_editor_shim_callbacks): New.
* subversion/libsvn_ra/ra_loader.h
(svn_ra__vtable_t): Add the register_editor_shim_callbacks member.
Modified:
subversion/trunk/subversion/include/private/svn_ra_private.h
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra/ra_loader.h
Modified: subversion/trunk/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_ra_private.h?rev=1291562&r1=1291561&r2=1291562&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_private.h Tue Feb 21 02:42:56 2012
@@ -31,6 +31,7 @@
#include "svn_error.h"
#include "svn_ra.h"
+#include "svn_delta.h"
#ifdef __cplusplus
extern "C" {
@@ -126,6 +127,11 @@ svn_ra__get_fspath_relative_to_root(svn_
const char *url,
apr_pool_t *pool);
+/** Register CALLBACKS to be used with the Ev2 shims in RA_SESSION. */
+svn_error_t *
+svn_ra__register_editor_shim_callbacks(svn_ra_session_t *ra_session,
+ svn_delta_shim_callbacks_t *callbacks);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1291562&r1=1291561&r2=1291562&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 21 02:42:56 2012
@@ -1304,6 +1304,15 @@ svn_ra_print_ra_libraries(svn_stringbuf_
}
+svn_error_t *
+svn_ra__register_editor_shim_callbacks(svn_ra_session_t *session,
+ svn_delta_shim_callbacks_t *callbacks)
+{
+ session->vtable->register_editor_shim_callbacks(session, callbacks);
+ return SVN_NO_ERROR;
+}
+
+
/* Return the library version number. */
const svn_version_t *
svn_ra_version(void)
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.h?rev=1291562&r1=1291561&r2=1291562&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.h Tue Feb 21 02:42:56 2012
@@ -293,6 +293,8 @@ typedef struct svn_ra__vtable_t {
svn_revnum_t end_revision,
svn_revnum_t *revision_deleted,
apr_pool_t *pool);
+ svn_error_t *(*register_editor_shim_callbacks)(svn_ra_session_t *session,
+ svn_delta_shim_callbacks_t *callbacks);
} svn_ra__vtable_t;
Re: svn commit: r1291562 - in /subversion/trunk/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h
Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Feb 20, 2012 at 8:59 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Tue, Feb 21, 2012 at 02:42:56 -0000:
>> +++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 21 02:42:56 2012
>> +svn_error_t *
>> +svn_ra__register_editor_shim_callbacks(svn_ra_session_t *session,
>> + svn_delta_shim_callbacks_t *callbacks)
>> +{
>> + session->vtable->register_editor_shim_callbacks(session, callbacks);
>
> Missing SVN_ERR() wrapper
r1291574, thanks.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Re: svn commit: r1291562 - in /subversion/trunk/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h
Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Feb 20, 2012 at 8:59 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Tue, Feb 21, 2012 at 02:42:56 -0000:
>> +++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 21 02:42:56 2012
>> +svn_error_t *
>> +svn_ra__register_editor_shim_callbacks(svn_ra_session_t *session,
>> + svn_delta_shim_callbacks_t *callbacks)
>> +{
>> + session->vtable->register_editor_shim_callbacks(session, callbacks);
>
> Missing SVN_ERR() wrapper
r1291574, thanks.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Re: svn commit: r1291562 - in /subversion/trunk/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c
libsvn_ra/ra_loader.h
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Tue, Feb 21, 2012 at 02:42:56 -0000:
> +++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 21 02:42:56 2012
> +svn_error_t *
> +svn_ra__register_editor_shim_callbacks(svn_ra_session_t *session,
> + svn_delta_shim_callbacks_t *callbacks)
> +{
> + session->vtable->register_editor_shim_callbacks(session, callbacks);
Missing SVN_ERR() wrapper
Re: svn commit: r1291562 - in /subversion/trunk/subversion:
include/private/svn_ra_private.h libsvn_ra/ra_loader.c
libsvn_ra/ra_loader.h
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Tue, Feb 21, 2012 at 02:42:56 -0000:
> +++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 21 02:42:56 2012
> +svn_error_t *
> +svn_ra__register_editor_shim_callbacks(svn_ra_session_t *session,
> + svn_delta_shim_callbacks_t *callbacks)
> +{
> + session->vtable->register_editor_shim_callbacks(session, callbacks);
Missing SVN_ERR() wrapper