Author: hwright
Date: Sun Oct 21 02:30:12 2012
New Revision: 1400559
URL: http://svn.apache.org/viewvc?rev=1400559&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk.
(This causes build breakage to be fixed shortly.)
Modified:
subversion/branches/ev2-export/ (props changed)
subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h
subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c
subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1400554-1400558
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h?rev=1400559&r1=1400558&r2=1400559&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h
(original)
+++ subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h
Sun Oct 21 02:30:12 2012
@@ -208,8 +208,8 @@ typedef svn_error_t *(*svn_ra__get_copys
CB_BATON is the baton used/shared by the above three callbacks.
- CANCEL_FUNC/BATON is a standard cancellation function, and is used for
- the returned Ev2 editor, and possibly other RA-specific operations.
+ Cancellation is handled through the callbacks provided when SESSION
+ is initially opened.
*EDITOR will be allocated in RESULT_POOL, and all temporary allocations
will be performed in SCRATCH_POOL.
@@ -226,8 +226,6 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
svn_ra__provide_props_cb_t provide_props_cb,
svn_ra__get_copysrc_kind_cb_t get_copysrc_kind_cb,
void *cb_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c?rev=1400559&r1=1400558&r2=1400559&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c Sun Oct 21
02:30:12 2012
@@ -470,6 +470,8 @@ svn_error_t *svn_ra_open4(svn_ra_session
/* Create the session object. */
session = apr_pcalloc(sesspool, sizeof(*session));
+ session->cancel_func = callbacks->cancel_func;
+ session->cancel_baton = callback_baton;
session->vtable = vtable;
session->pool = sesspool;
@@ -1307,8 +1309,6 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
svn_ra__provide_props_cb_t provide_props_cb,
svn_ra__get_copysrc_kind_cb_t get_copysrc_kind_cb,
void *cb_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1333,7 +1333,7 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
provide_props_cb,
get_copysrc_kind_cb,
cb_baton,
- cancel_func, cancel_baton,
+ session->cancel_func, session->cancel_baton,
result_pool, scratch_pool));
}
@@ -1351,7 +1351,7 @@ svn_ra__get_commit_ev2(svn_editor_t **ed
provide_props_cb,
get_copysrc_kind_cb,
cb_baton,
- cancel_func, cancel_baton,
+ session->cancel_func, session->cancel_baton,
result_pool, scratch_pool));
}
Modified: subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h?rev=1400559&r1=1400558&r2=1400559&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h Sun Oct 21
02:30:12 2012
@@ -330,6 +330,10 @@ typedef struct svn_ra__vtable_t {
struct svn_ra_session_t {
const svn_ra__vtable_t *vtable;
+ /* Cancellation handlers consumers may want to use. */
+ svn_cancel_func_t cancel_func;
+ void *cancel_baton;
+
/* Pool used to manage this session. */
apr_pool_t *pool;
