Checkout
Julian Foad
committed
on 14 Oct 15
On the 'move-tracking-2' branch: More refactoring, disentangling the concept
of nested branches from the basic concept of branches, followin… Show more
On the 'move-tracking-2' branch: More refactoring, disentangling the concept

of nested branches from the basic concept of branches, following r1708550.

* subversion/include/private/svn_branch.h,

 subversion/libsvn_delta/branch.c

 (svn_branch_state_t): Move the element mapping into a sub-structure.

 (svn_branch_root_eid,

  svn_branch_get_element_tree,

  svn_branch_get_element_tree_at_eid): New.

 (svn_branch_el_rev_content_t,

  svn_branch_el_rev_content_create,

  svn_branch_el_rev_content_dup,

  svn_branch_el_rev_content_equal): Move to element.c/h.

 (svn_branch_subtree_t,

  svn_branch_subtree_create,

  svn_branch_subtree_get_subbranch_at_eid): Move to branch_nested.c/h.

 (svn_branch_get_element_tree_at_eid): Rename from

   'svn_branch_get_subtree_n' and change the return type.

 (svn_branch_instantiate_elements,

  svn_branch_map_add_subtree): Change an input parameter type.

 (svn_branch_subtree_get_path_by_eid): Delete; the replacement is

   'svn_element_tree_get_path_by_eid'.

 (map_purge_orphans): Delete; the replacement is

   'svn_element_tree_purge_orphans'.

* subversion/include/private/svn_branch_nested.h,

 subversion/libsvn_delta/branch_nested.c

 (svn_branch_subtree_t,

  svn_branch_subtree_create,

 (svn_branch_subtree_get_subbranch_at_eid): Moved from branch.c/h.

* subversion/include/private/svn_element.h,

 subversion/libsvn_delta/element.c

 (svn_branch_el_rev_content_t,

  svn_branch_el_rev_content_create,

  svn_branch_el_rev_content_dup,

  svn_branch_el_rev_content_equal): Move from branch.c/h.

 (svn_element_tree_t,

  svn_element_tree_create,

  svn_element_tree_get,

  svn_element_tree_set,

  svn_element_tree_purge_orphans,

  svn_element_tree_get_path_by_eid): New.

* subversion/libsvn_delta/compat3e.c

 Update all callers/users.

* subversion/svnmover/svnmover.c

 Update all callers/users.

Show less