You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/22 11:41:33 UTC
svn commit: r1709971 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_branch.h libsvn_delta/branch.c
libsvn_delta/branch_nested.c libsvn_delta/branch_private.h
Author: julianfoad
Date: Thu Oct 22 09:41:33 2015
New Revision: 1709971
URL: http://svn.apache.org/viewvc?rev=1709971&view=rev
Log:
On the 'move-tracking-2' branch: Add an 'abort' method to the txn class.
This continues the refactoring to use branch txn/state objects instead of
a single 'editor'.
* subversion/include/private/svn_branch.h
(svn_branch_txn_abort): New.
* subversion/libsvn_delta/branch.c
(branch_txn_abort,
svn_branch_txn_abort): New.
(branch_txn_create): Add it.
* subversion/libsvn_delta/branch_nested.c
(nested_branch_txn_abort): New.
(svn_nested_branch_txn_create): Add it.
* subversion/libsvn_delta/branch_private.h
(branch_txn_v_abort_t): New.
(svn_branch_txn_vtable_t): Add it.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1709971&r1=1709970&r2=1709971&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Thu Oct 22 09:41:33 2015
@@ -226,6 +226,10 @@ svn_error_t *
svn_branch_txn_complete(svn_branch_txn_t *txn,
apr_pool_t *scratch_pool);
+svn_error_t *
+svn_branch_txn_abort(svn_branch_txn_t *txn,
+ apr_pool_t *scratch_pool);
+
/* Change txn-local EIDs (negative integers) in TXN to revision EIDs, by
* assigning a new revision-EID (positive integer) for each one.
*
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1709971&r1=1709970&r2=1709971&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu Oct 22 09:41:33 2015
@@ -306,6 +306,14 @@ branch_txn_complete(svn_branch_txn_t *tx
return SVN_NO_ERROR;
}
+/* An #svn_branch_txn_t method. */
+static svn_error_t *
+branch_txn_abort(svn_branch_txn_t *txn,
+ apr_pool_t *scratch_pool)
+{
+ return SVN_NO_ERROR;
+}
+
/*
* ========================================================================
* Branch Txn Object
@@ -423,6 +431,15 @@ svn_branch_txn_complete(svn_branch_txn_t
return SVN_NO_ERROR;
}
+svn_error_t *
+svn_branch_txn_abort(svn_branch_txn_t *txn,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR(txn->vtable->abort(txn,
+ scratch_pool));
+ return SVN_NO_ERROR;
+}
+
svn_branch_txn_t *
svn_branch_txn_create(const svn_branch_txn_vtable_t *vtable,
svn_cancel_func_t cancel_func,
@@ -466,6 +483,7 @@ branch_txn_create(svn_branch_repos_t *re
branch_txn_branch,
branch_txn_sequence_point,
branch_txn_complete,
+ branch_txn_abort,
};
svn_branch_txn_t *txn
= svn_branch_txn_create(&vtable, NULL, NULL, result_pool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c?rev=1709971&r1=1709970&r2=1709971&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c Thu Oct 22 09:41:33 2015
@@ -542,6 +542,17 @@ nested_branch_txn_complete(svn_branch_tx
return SVN_NO_ERROR;
}
+/* An #svn_branch_txn_t method. */
+static svn_error_t *
+nested_branch_txn_abort(svn_branch_txn_t *txn,
+ apr_pool_t *scratch_pool)
+{
+ /* Just forwarding: nothing more is needed. */
+ SVN_ERR(svn_branch_txn_abort(txn->priv->wrapped_txn,
+ scratch_pool));
+ return SVN_NO_ERROR;
+}
+
svn_branch_txn_t *
svn_nested_branch_txn_create(svn_branch_txn_t *wrapped_txn,
apr_pool_t *result_pool)
@@ -557,6 +568,7 @@ svn_nested_branch_txn_create(svn_branch_
nested_branch_txn_branch,
nested_branch_txn_sequence_point,
nested_branch_txn_complete,
+ nested_branch_txn_abort,
};
svn_branch_txn_t *txn
= svn_branch_txn_create(&vtable, NULL, NULL, result_pool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h?rev=1709971&r1=1709970&r2=1709971&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h Thu Oct 22 09:41:33 2015
@@ -106,6 +106,10 @@ typedef svn_error_t *(*branch_txn_v_comp
svn_branch_txn_t *txn,
apr_pool_t *scratch_pool);
+typedef svn_error_t *(*branch_txn_v_abort_t)(
+ svn_branch_txn_t *txn,
+ apr_pool_t *scratch_pool);
+
struct svn_branch_txn_vtable_t
{
svn_vtable_priv_t vpriv;
@@ -120,6 +124,7 @@ struct svn_branch_txn_vtable_t
branch_txn_v_branch_t branch;
branch_txn_v_sequence_point_t sequence_point;
branch_txn_v_complete_t complete;
+ branch_txn_v_complete_t abort;
};