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

[ju...@apache.org]

Author: julianfoad
Date: Tue Sep 15 14:02:44 2015
New Revision: 1703199

URL: http://svn.apache.org/r1703199
Log:
On the 'move-tracking-2' branch: Tweak an API to remove an unneeded option.

* subversion/include/private/svn_branch.h,
  subversion/libsvn_delta/branch.c
  (svn_branch_add_new_branch): Require the caller to specify the new branch
    root EID. (Callers already comply.)

* subversion/include/private/svn_editor3e.h
  (svn_editor3_open_branch): Correct the documentation -- the same requirement
    is already enforced in this API.

Modified:
    subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
    subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.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=1703199&r1=1703198&r2=1703199&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 Tue Sep 15 14:02:44 2015
@@ -292,8 +292,7 @@ svn_branch_id_split(const char **outer_b
  * to be nested under OUTER_BRANCH:OUTER_EID, but do not require that
  * a subbranch root element exists there, nor create one.
  *
- * Set the root element to ROOT_EID, or, if ROOT_EID is -1, allocate a new
- * EID for the root element.
+ * Set the root element to ROOT_EID.
  */
 svn_branch_state_t *
 svn_branch_add_new_branch(svn_branch_revision_root_t *rev_root,

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h?rev=1703199&r1=1703198&r2=1703199&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h Tue Sep 15 14:02:44 2015
@@ -584,9 +584,8 @@ svn_editor3_new_eid(svn_editor3_t *edito
 
 /** Create a new branch or access an existing branch.
  *
- * When creating a branch, declare its root element id to be ROOT_EID. If
- * ROOT_EID is -1, allocate a new EID for its root. Do not instantiate the
- * root element, nor any other elements.
+ * When creating a branch, declare its root element id to be ROOT_EID. Do
+ * not instantiate the root element, nor any other elements.
  *
  * We use a common 'open subbranch' method for both 'find' and 'add'
  * cases, according to the principle that the editor dictates the new

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=1703199&r1=1703198&r2=1703199&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue Sep 15 14:02:44 2015
@@ -860,11 +860,10 @@ svn_branch_add_new_branch(svn_branch_rev
   svn_branch_state_t *new_branch;
 
   SVN_ERR_ASSERT_NO_RETURN(!outer_branch || outer_branch->rev_root == rev_root);
+  SVN_ERR_ASSERT_NO_RETURN(root_eid != -1);
 
   if (! outer_branch)
     outer_eid = rev_root->root_branches->nelts;
-  if (root_eid == -1)
-    root_eid = svn_branch_revision_root_new_eid(rev_root);
 
   new_branch = svn_branch_state_create(root_eid, rev_root,
                                        outer_branch, outer_eid,