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 16:37:09 UTC

svn commit: r1710028 - 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 libsvn_ra/ra_loader.c svnmover/svnmover.c

Author: julianfoad
Date: Thu Oct 22 14:37:09 2015
New Revision: 1710028

URL: http://svn.apache.org/viewvc?rev=1710028&view=rev
Log:
On the 'move-tracking-2' branch: Virtualize two more 'branch txn' methods.
Ensure derived classes initialize the public member variables.

This continues the refactoring to use branch txn/state objects instead of
a single 'editor'.

* subversion/include/private/svn_branch.h
  (svn_branch_txn_serialize): Move function parameters to the usual order.

* subversion/libsvn_delta/branch.c
  (svn_branch_txn_finalize_eids,
   svn_branch_txn_serialize): Split into a static implementation and a
    public dispatcher.
  (branch_txn_create): Move further down the file. Add the new methods to
    the vtable.
  (svn_branch_txn_get_branch_by_id): Use only public methods so this does
    not need to be virtual.

* subversion/libsvn_delta/branch_nested.c
  (nested_branch_txn_finalize_eids,
   nested_branch_txn_serialize): New.
  (svn_nested_branch_txn_create): Add the new methods to the vtable.
    Initialize the public member variables.

* subversion/libsvn_delta/branch_private.h
  (branch_txn_v_finalize_eids_t,
   branch_txn_v_serialize_t): New.
  (svn_branch_txn_vtable_t): Add the new methods.

* subversion/libsvn_ra/ra_loader.c
  (svn_branch_revision_fetch_info,
   store_repos_info): Track the parameter order change.

* subversion/svnmover/svnmover.c
  (execute): Track the parameter order change.

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
    subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

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=1710028&r1=1710027&r2=1710028&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 14:37:09 2015
@@ -591,8 +591,8 @@ svn_branch_txn_parse(svn_branch_txn_t **
 /* Write to STREAM a parseable representation of TXN.
  */
 svn_error_t *
-svn_branch_txn_serialize(svn_stream_t *stream,
-                         svn_branch_txn_t *txn,
+svn_branch_txn_serialize(svn_branch_txn_t *txn,
+                         svn_stream_t *stream,
                          apr_pool_t *scratch_pool);
 
 /* Write to STREAM a parseable representation of BRANCH.

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=1710028&r1=1710027&r2=1710028&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 14:37:09 2015
@@ -442,6 +442,26 @@ svn_branch_txn_branch(svn_branch_txn_t *
 }
 
 svn_error_t *
+svn_branch_txn_finalize_eids(svn_branch_txn_t *txn,
+                             apr_pool_t *scratch_pool)
+{
+  SVN_ERR(txn->vtable->finalize_eids(txn,
+                                     scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_branch_txn_serialize(svn_branch_txn_t *txn,
+                         svn_stream_t *stream,
+                         apr_pool_t *scratch_pool)
+{
+  SVN_ERR(txn->vtable->serialize(txn,
+                                 stream,
+                                 scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
 svn_branch_txn_sequence_point(svn_branch_txn_t *txn,
                               apr_pool_t *scratch_pool)
 {
@@ -490,41 +510,6 @@ svn_branch_txn_create(const svn_branch_t
   return txn;
 }
 
-/* Create a new branch txn object.
- *
- * It will have no branches.
- */
-static svn_branch_txn_t *
-branch_txn_create(svn_branch_repos_t *repos,
-                  svn_revnum_t rev,
-                  svn_revnum_t base_rev,
-                  apr_pool_t *result_pool)
-{
-  static const svn_branch_txn_vtable_t vtable = {
-    {0},
-    branch_txn_get_branches,
-    branch_txn_add_branch,
-    branch_txn_add_new_branch,
-    branch_txn_delete_branch,
-    branch_txn_get_num_new_eids,
-    branch_txn_new_eid,
-    branch_txn_open_branch,
-    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);
-
-  txn->priv = apr_pcalloc(result_pool, sizeof(*txn->priv));
-  txn->repos = repos;
-  txn->rev = rev;
-  txn->base_rev = base_rev;
-  txn->priv->branches = svn_array_make(result_pool);
-  return txn;
-}
-
 /*
  * ========================================================================
  */
@@ -592,9 +577,10 @@ branch_finalize_eids(svn_branch_state_t
   return SVN_NO_ERROR;
 }
 
-svn_error_t *
-svn_branch_txn_finalize_eids(svn_branch_txn_t *txn,
-                             apr_pool_t *scratch_pool)
+/* An #svn_branch_txn_t method. */
+static svn_error_t *
+branch_txn_finalize_eids(svn_branch_txn_t *txn,
+                         apr_pool_t *scratch_pool)
 {
   int n_txn_eids = (-1) - txn->priv->first_eid;
   int mapping_offset;
@@ -625,12 +611,45 @@ svn_branch_txn_finalize_eids(svn_branch_
  * ========================================================================
  */
 
+static svn_error_t *
+branch_txn_serialize(svn_branch_txn_t *txn,
+                     svn_stream_t *stream,
+                     apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *branches = branch_txn_get_branches(txn, scratch_pool);
+  SVN_ITER_T(svn_branch_state_t) *bi;
+
+  SVN_ERR(svn_stream_printf(stream, scratch_pool,
+                            "r%ld: eids %d %d "
+                            "branches %d\n",
+                            txn->rev,
+                            txn->priv->first_eid, txn->priv->next_eid,
+                            branches->nelts));
+
+  for (SVN_ARRAY_ITER(bi, branches, scratch_pool))
+    {
+      svn_branch_state_t *branch = bi->val;
+
+      if (branch->predecessor && branch->predecessor->rev < 0)
+        {
+          branch->predecessor->rev = txn->rev;
+        }
+
+      SVN_ERR(svn_branch_state_serialize(stream, bi->val, bi->iterpool));
+    }
+  return SVN_NO_ERROR;
+}
+
+/*
+ * ========================================================================
+ */
+
 svn_branch_state_t *
 svn_branch_txn_get_branch_by_id(const svn_branch_txn_t *txn,
                                 const char *branch_id,
                                 apr_pool_t *scratch_pool)
 {
-  apr_array_header_t *branches = branch_txn_get_branches(txn, scratch_pool);
+  apr_array_header_t *branches = svn_branch_txn_get_branches(txn, scratch_pool);
   SVN_ITER_T(svn_branch_state_t) *bi;
   svn_branch_state_t *branch = NULL;
 
@@ -651,6 +670,47 @@ svn_branch_txn_get_branch_by_id(const sv
  * ========================================================================
  */
 
+/* Create a new branch txn object.
+ *
+ * It will have no branches.
+ */
+static svn_branch_txn_t *
+branch_txn_create(svn_branch_repos_t *repos,
+                  svn_revnum_t rev,
+                  svn_revnum_t base_rev,
+                  apr_pool_t *result_pool)
+{
+  static const svn_branch_txn_vtable_t vtable = {
+    {0},
+    branch_txn_get_branches,
+    branch_txn_add_branch,
+    branch_txn_add_new_branch,
+    branch_txn_delete_branch,
+    branch_txn_get_num_new_eids,
+    branch_txn_new_eid,
+    branch_txn_open_branch,
+    branch_txn_branch,
+    branch_txn_finalize_eids,
+    branch_txn_serialize,
+    branch_txn_sequence_point,
+    branch_txn_complete,
+    branch_txn_abort,
+  };
+  svn_branch_txn_t *txn
+    = svn_branch_txn_create(&vtable, NULL, NULL, result_pool);
+
+  txn->priv = apr_pcalloc(result_pool, sizeof(*txn->priv));
+  txn->repos = repos;
+  txn->rev = rev;
+  txn->base_rev = base_rev;
+  txn->priv->branches = svn_array_make(result_pool);
+  return txn;
+}
+
+/*
+ * ========================================================================
+ */
+
 static void
 branch_validate_element(const svn_branch_state_t *branch,
                         int eid,
@@ -1528,36 +1588,6 @@ svn_branch_state_serialize(svn_stream_t
   return SVN_NO_ERROR;
 }
 
-svn_error_t *
-svn_branch_txn_serialize(svn_stream_t *stream,
-                         svn_branch_txn_t *txn,
-                         apr_pool_t *scratch_pool)
-{
-  apr_array_header_t *branches = branch_txn_get_branches(txn, scratch_pool);
-  SVN_ITER_T(svn_branch_state_t) *bi;
-
-  SVN_ERR(svn_stream_printf(stream, scratch_pool,
-                            "r%ld: eids %d %d "
-                            "branches %d\n",
-                            txn->rev,
-                            txn->priv->first_eid, txn->priv->next_eid,
-                            branches->nelts));
-
-  for (SVN_ARRAY_ITER(bi, branches, scratch_pool))
-    {
-      svn_branch_state_t *branch = bi->val;
-
-      if (branch->predecessor && branch->predecessor->rev < 0)
-        {
-          branch->predecessor->rev = txn->rev;
-        }
-
-      SVN_ERR(svn_branch_state_serialize(stream, bi->val, bi->iterpool));
-    }
-  return SVN_NO_ERROR;
-}
-
-
 /*
  * ========================================================================
  */

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=1710028&r1=1710027&r2=1710028&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 14:37:09 2015
@@ -513,6 +513,34 @@ nested_branch_txn_branch(svn_branch_txn_
   return SVN_NO_ERROR;
 }
 
+/* Implements nested branching.
+ * An #svn_branch_txn_t method. */
+static svn_error_t *
+nested_branch_txn_finalize_eids(svn_branch_txn_t *txn,
+                                apr_pool_t *scratch_pool)
+{
+  /* Just forwarding: nothing more is needed. */
+  SVN_ERR(svn_branch_txn_finalize_eids(txn->priv->wrapped_txn,
+                                       scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Implements nested branching.
+ * An #svn_branch_txn_t method. */
+static svn_error_t *
+nested_branch_txn_serialize(svn_branch_txn_t *txn,
+                            svn_stream_t *stream,
+                            apr_pool_t *scratch_pool)
+{
+  /* Just forwarding: nothing more is needed. */
+  SVN_ERR(svn_branch_txn_serialize(txn->priv->wrapped_txn,
+                                   stream,
+                                   scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Implements nested branching.
+ * An #svn_branch_txn_t method. */
 static svn_error_t *
 nested_branch_txn_sequence_point(svn_branch_txn_t *txn,
                                  apr_pool_t *scratch_pool)
@@ -581,6 +609,8 @@ svn_nested_branch_txn_create(svn_branch_
     nested_branch_txn_new_eid,
     nested_branch_txn_open_branch,
     nested_branch_txn_branch,
+    nested_branch_txn_finalize_eids,
+    nested_branch_txn_serialize,
     nested_branch_txn_sequence_point,
     nested_branch_txn_complete,
     nested_branch_txn_abort,
@@ -590,6 +620,9 @@ svn_nested_branch_txn_create(svn_branch_
 
   txn->priv = apr_pcalloc(result_pool, sizeof(*txn->priv));
   txn->priv->wrapped_txn = wrapped_txn;
+  txn->repos = wrapped_txn->repos;
+  txn->rev = wrapped_txn->rev;
+  txn->base_rev = wrapped_txn->base_rev;
   return txn;
 }
 

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=1710028&r1=1710027&r2=1710028&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 14:37:09 2015
@@ -103,6 +103,15 @@ typedef svn_error_t *(*branch_txn_v_bran
   apr_pool_t *result_pool,
   apr_pool_t *scratch_pool);
 
+typedef svn_error_t *(*branch_txn_v_finalize_eids_t)(
+  svn_branch_txn_t *txn,
+  apr_pool_t *scratch_pool);
+
+typedef svn_error_t *(*branch_txn_v_serialize_t)(
+  svn_branch_txn_t *txn,
+  svn_stream_t *stream,
+  apr_pool_t *scratch_pool);
+
 typedef svn_error_t *(*branch_txn_v_sequence_point_t)(
   svn_branch_txn_t *txn,
   apr_pool_t *scratch_pool);
@@ -128,6 +137,8 @@ struct svn_branch_txn_vtable_t
   branch_txn_v_new_eid_t new_eid;
   branch_txn_v_open_branch_t open_branch;
   branch_txn_v_branch_t branch;
+  branch_txn_v_finalize_eids_t finalize_eids;
+  branch_txn_v_serialize_t serialize;
   branch_txn_v_sequence_point_t sequence_point;
   branch_txn_v_complete_t complete;
   branch_txn_v_complete_t abort;

Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1710028&r1=1710027&r2=1710028&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Thu Oct 22 14:37:09 2015
@@ -715,7 +715,7 @@ svn_branch_revision_fetch_info(svn_branc
     svn_stringbuf_t *buf = svn_stringbuf_create_empty(scratch_pool);
 
     stream = svn_stream_from_stringbuf(buf, scratch_pool);
-    SVN_ERR(svn_branch_txn_serialize(stream, txn, scratch_pool));
+    SVN_ERR(svn_branch_txn_serialize(txn, stream, scratch_pool));
     SVN_ERR(svn_stream_close(stream));
 
     SVN_ERR_ASSERT(svn_string_compare(value,
@@ -860,7 +860,7 @@ store_repos_info(svn_branch_txn_t *txn,
   svn_stringbuf_t *buf = svn_stringbuf_create_empty(scratch_pool);
   svn_stream_t *stream = svn_stream_from_stringbuf(buf, scratch_pool);
 
-  SVN_ERR(svn_branch_txn_serialize(stream, txn, scratch_pool));
+  SVN_ERR(svn_branch_txn_serialize(txn, stream, scratch_pool));
 
   SVN_ERR(svn_stream_close(stream));
   /*SVN_DBG(("store_repos_info: %s", buf->data));*/

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1710028&r1=1710027&r2=1710028&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu Oct 22 14:37:09 2015
@@ -3232,9 +3232,8 @@ execute(svnmover_wc_t *wc,
               {
                 svn_stream_t *stream;
                 SVN_ERR(svn_stream_for_stdout(&stream, iterpool));
-                SVN_ERR(svn_branch_txn_serialize(
+                SVN_ERR(svn_branch_txn_serialize(wc->working->branch->txn,
                           stream,
-                          wc->working->branch->txn,
                           iterpool));
               }
             else