diff options
Diffstat (limited to 'subversion/include/private/svn_editor.h')
| -rw-r--r-- | subversion/include/private/svn_editor.h | 81 |
1 files changed, 11 insertions, 70 deletions
diff --git a/subversion/include/private/svn_editor.h b/subversion/include/private/svn_editor.h index d714bb17a00d..aa8a2ac0904d 100644 --- a/subversion/include/private/svn_editor.h +++ b/subversion/include/private/svn_editor.h @@ -270,7 +270,6 @@ svn_delta_shim_callbacks_default(apr_pool_t *result_pool); * svn_editor_setcb_delete() \n * svn_editor_setcb_copy() \n * svn_editor_setcb_move() \n - * svn_editor_setcb_rotate() \n * svn_editor_setcb_complete() \n * svn_editor_setcb_abort() * @@ -293,7 +292,6 @@ svn_delta_shim_callbacks_default(apr_pool_t *result_pool); * svn_editor_delete() \n * svn_editor_copy() \n * svn_editor_move() \n - * svn_editor_rotate() * \n\n * Just before each callback invocation is carried out, the @a cancel_func * that was passed to svn_editor_create() is invoked to poll any @@ -325,7 +323,7 @@ svn_delta_shim_callbacks_default(apr_pool_t *result_pool); * In order to reduce complexity of callback receivers, the editor callbacks * must be driven in adherence to these rules: * - * - If any path is added (with add_*) or deleted/moved/rotated, then + * - If any path is added (with add_*) or deleted/moved, then * an svn_editor_alter_directory() call must be made for its parent * directory with the target/eventual set of children. * @@ -344,15 +342,13 @@ svn_delta_shim_callbacks_default(apr_pool_t *result_pool); * its children, if a directory) may be copied many times, and are * otherwise subject to the Once Rule. The destination path of a copy * or move may have alter_* operations applied, but not add_* or delete. - * If the destination path of a copy, move, or rotate is a directory, + * If the destination path of a copy or move is a directory, * then its children are subject to the Once Rule. The source path of * a move (and its child paths) may be referenced in add_*, or as the * destination of a copy (where these new or copied nodes are subject - * to the Once Rule). Paths listed in a rotation are both sources and - * destinations, so they may not be referenced again in an add_* or a - * deletion; these paths may have alter_* operations applied. + * to the Once Rule). * - * - The ancestor of an added, copied-here, moved-here, rotated, or + * - The ancestor of an added, copied-here, moved-here, or * modified node may not be deleted. The ancestor may not be moved * (instead: perform the move, *then* the edits). * @@ -375,10 +371,6 @@ svn_delta_shim_callbacks_default(apr_pool_t *result_pool); * by a delete... that is fine. It is simply that svn_editor_move() * should be used to describe a semantic move. * - * - Paths mentioned in svn_editor_rotate() may have their properties - * and contents edited (via alter_* calls) by a previous or later call, - * but they may not be subject to a later move, rotate, or deletion. - * * - One of svn_editor_complete() or svn_editor_abort() must be called * exactly once, which must be the final call the driver invokes. * Invoking svn_editor_complete() must imply that the set of changes has @@ -573,9 +565,9 @@ typedef svn_error_t *(*svn_editor_cb_alter_file_t)( void *baton, const char *relpath, svn_revnum_t revision, - apr_hash_t *props, const svn_checksum_t *checksum, svn_stream_t *contents, + apr_hash_t *props, apr_pool_t *scratch_pool); /** @see svn_editor_alter_symlink(), svn_editor_t. @@ -585,8 +577,8 @@ typedef svn_error_t *(*svn_editor_cb_alter_symlink_t)( void *baton, const char *relpath, svn_revnum_t revision, - apr_hash_t *props, const char *target, + apr_hash_t *props, apr_pool_t *scratch_pool); /** @see svn_editor_delete(), svn_editor_t. @@ -620,15 +612,6 @@ typedef svn_error_t *(*svn_editor_cb_move_t)( svn_revnum_t replaces_rev, apr_pool_t *scratch_pool); -/** @see svn_editor_rotate(), svn_editor_t. - * @since New in 1.8. - */ -typedef svn_error_t *(*svn_editor_cb_rotate_t)( - void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool); - /** @see svn_editor_complete(), svn_editor_t. * @since New in 1.8. */ @@ -790,17 +773,6 @@ svn_editor_setcb_move(svn_editor_t *editor, svn_editor_cb_move_t callback, apr_pool_t *scratch_pool); -/** Sets the #svn_editor_cb_rotate_t callback in @a editor - * to @a callback. - * @a scratch_pool is used for temporary allocations (if any). - * @see also svn_editor_setcb_many(). - * @since New in 1.8. - */ -svn_error_t * -svn_editor_setcb_rotate(svn_editor_t *editor, - svn_editor_cb_rotate_t callback, - apr_pool_t *scratch_pool); - /** Sets the #svn_editor_cb_complete_t callback in @a editor * to @a callback. * @a scratch_pool is used for temporary allocations (if any). @@ -841,7 +813,6 @@ typedef struct svn_editor_cb_many_t svn_editor_cb_delete_t cb_delete; svn_editor_cb_copy_t cb_copy; svn_editor_cb_move_t cb_move; - svn_editor_cb_rotate_t cb_rotate; svn_editor_cb_complete_t cb_complete; svn_editor_cb_abort_t cb_abort; @@ -1020,9 +991,9 @@ svn_error_t * svn_editor_alter_file(svn_editor_t *editor, const char *relpath, svn_revnum_t revision, - apr_hash_t *props, const svn_checksum_t *checksum, - svn_stream_t *contents); + svn_stream_t *contents, + apr_hash_t *props); /** Drive @a editor's #svn_editor_cb_alter_symlink_t callback. * @@ -1047,8 +1018,8 @@ svn_error_t * svn_editor_alter_symlink(svn_editor_t *editor, const char *relpath, svn_revnum_t revision, - apr_hash_t *props, - const char *target); + const char *target, + apr_hash_t *props); /** Drive @a editor's #svn_editor_cb_delete_t callback. * @@ -1093,7 +1064,7 @@ svn_editor_copy(svn_editor_t *editor, * expect to find this node. That is, @a src_relpath at the start of * the whole edit and @a src_relpath at @a src_revision must lie within * the same node-rev (aka history-segment). This is just like the - * revisions specified to svn_editor_delete() and svn_editor_rotate(). + * revisions specified to svn_editor_delete(). * * For a description of @a replaces_rev, see svn_editor_add_file(). * @@ -1110,36 +1081,6 @@ svn_editor_move(svn_editor_t *editor, const char *dst_relpath, svn_revnum_t replaces_rev); -/** Drive @a editor's #svn_editor_cb_rotate_t callback. - * - * Perform a rotation among multiple nodes in the target tree. - * - * The @a relpaths and @a revisions arrays (pair-wise) specify nodes in the - * tree which are located at a path and expected to be at a specific - * revision. These nodes are simultaneously moved in a rotation pattern. - * For example, the node at index 0 of @a relpaths and @a revisions will - * be moved to the relpath specified at index 1 of @a relpaths. The node - * at index 1 will be moved to the location at index 2. The node at index - * N-1 will be moved to the relpath specified at index 0. - * - * The simplest form of this operation is to swap nodes A and B. One may - * think to move A to a temporary location T, then move B to A, then move - * T to B. However, this last move violations the Once Rule by moving T - * (which had already by edited by the move from A). In order to keep the - * restrictions against multiple moves of a single node, the rotation - * operation is needed for certain types of tree edits. - * - * ### what happens if one of the paths of the rotation is not "within" the - * ### receiver's set of paths? - * - * For all restrictions on driving the editor, see #svn_editor_t. - * @since New in 1.8. - */ -svn_error_t * -svn_editor_rotate(svn_editor_t *editor, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions); - /** Drive @a editor's #svn_editor_cb_complete_t callback. * * Send word that the edit has been completed successfully. |