svn commit: r1678220 - in /subversion/branches/move-tracking-2/subversion: include/private/svn_branch.h libsvn_delta/branch.c svnmover/svnmover.c

[ju...@apache.org]

Author: julianfoad
Date: Thu May  7 14:38:35 2015
New Revision: 1678220

URL: http://svn.apache.org/r1678220
Log:
On the 'move-tracking-2' branch: A small refactoring.

* subversion/include/private/svn_branch.h,
  subversion/libsvn_delta/branch.c
  (svn_branch_add_new_branch): If the given root EID is -1, allocate a new EID.

* subversion/svnmover/svnmover.c
  (mk_branch): Don't allocate a new EID here; let
    svn_branch_add_new_branch() do 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/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=1678220&r1=1678219&r2=1678220&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 May  7 14:38:35 2015
@@ -254,6 +254,9 @@ svn_branch_state_create(int root_eid,
  *
  * Do not require that a subbranch root element exists in OUTER_BRANCH,
  * nor create one.
+ *
+ * Set the root element to ROOT_EID, or, if ROOT_EID is -1, allocate a new
+ * EID for the root element.
  */
 svn_branch_state_t *
 svn_branch_add_new_branch(svn_branch_state_t *outer_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=1678220&r1=1678219&r2=1678220&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu May  7 14:38:35 2015
@@ -790,10 +790,14 @@ svn_branch_add_new_branch(svn_branch_sta
                           int root_eid,
                           apr_pool_t *scratch_pool)
 {
-  svn_branch_state_t *new_branch
-    = svn_branch_state_create(root_eid, outer_branch->rev_root,
-                              outer_branch, outer_eid,
-                              outer_branch->rev_root->repos->pool);
+  svn_branch_state_t *new_branch;
+
+  if (root_eid == -1)
+    root_eid = svn_branch_allocate_new_eid(outer_branch->rev_root);
+
+  new_branch = svn_branch_state_create(root_eid, outer_branch->rev_root,
+                                       outer_branch, outer_eid,
+                                       outer_branch->rev_root->repos->pool);
 
   /* A branch must not already exist at this outer element */
   SVN_ERR_ASSERT_NO_RETURN(svn_branch_get_subbranch_at_eid(

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=1678220&r1=1678219&r2=1678220&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu May  7 14:38:35 2015
@@ -1668,7 +1668,6 @@ mk_branch(svn_branch_state_t **new_branc
           svn_element_payload_t *payload,
           apr_pool_t *iterpool)
 {
-  int new_root_eid = svn_branch_allocate_new_eid(outer_branch->rev_root);
   int new_outer_eid;
   svn_branch_state_t *new_branch;
 
@@ -1676,9 +1675,9 @@ mk_branch(svn_branch_state_t **new_branc
                           outer_branch, outer_parent_eid, outer_name,
                           NULL /*new_payload*/));
   new_branch = svn_branch_add_new_branch(
-                 outer_branch, new_outer_eid, new_root_eid,
+                 outer_branch, new_outer_eid, -1/*new_root_eid*/,
                  iterpool);
-  svn_branch_update_element(new_branch, new_root_eid,
+  svn_branch_update_element(new_branch, new_branch->root_eid,
                             -1, "", payload);
   *new_branch_p = new_branch;
   return SVN_NO_ERROR;