Checkout
Julian Foad
committed
on 06 Oct 15
On the 'move-tracking-2' branch: Refactoring towards moving the
subbranch-root element concept to a higher level. Represent a subbranch-root… Show more
On the 'move-tracking-2' branch: Refactoring towards moving the

subbranch-root element concept to a higher level. Represent a subbranch-root

payload by a payload object with a flag set, rather than by null, and

eliminate some special handling of a subbranch-root element.

* subversion/include/private/svn_branch.h

 (svn_branch_update_subbranch_root_element): Delete.

* subversion/include/private/svn_element.h

 (svn_element_payload_t): Add an 'is_subbranch_root' field.

 (svn_element_payload_create_subbranch): New.

* subversion/libsvn_delta/branch.c

 (svn_branch_update_subbranch_root_element): Delete.

 (branch_validate_element,

  map_purge_orphans,

  svn_branch_map_add_subtree,

  svn_branch_state_parse,

  svn_branch_state_serialize): Update the callers/users.

* subversion/libsvn_delta/compat3e.c

 (editor3_alter): Update the callers/users.

* subversion/libsvn_delta/editor3e.c

 (svn_editor3_alter,

  svn_editor3_copy_one,

  svn_editor3_payload_resolve,

  wrap_alter): Update the callers/users.

* subversion/libsvn_delta/element.c

 (svn_element_payload_invariants,

  svn_element_payload_equal): Update the callers/users.

 (svn_element_payload_create_subbranch): New.

* subversion/svnmover/svnmover.c

 (subtree_replay,

  element_merge,

  mk_branch,

  do_branch): Update the callers/users.

Show less