Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 45992105F7 for ; Wed, 4 Sep 2013 09:46:46 +0000 (UTC) Received: (qmail 51989 invoked by uid 500); 4 Sep 2013 09:46:45 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51874 invoked by uid 500); 4 Sep 2013 09:46:43 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 51859 invoked by uid 99); 4 Sep 2013 09:46:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Sep 2013 09:46:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Sep 2013 09:46:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3F6BC238899C; Wed, 4 Sep 2013 09:46:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519958 - in /subversion/trunk: notes/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/ subversion/bindings/javahl/tests/org... Date: Wed, 04 Sep 2013 09:46:12 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130904094613.3F6BC238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Wed Sep 4 09:46:12 2013 New Revision: 1519958 URL: http://svn.apache.org/r1519958 Log: Remove Ev2 rotate. * subversion/include/private/svn_editor.h (svn_editor_cb_rotate_t, svn_editor_setcb_rotate, svn_editor_rotate): Remove. (svn_editor_cb_many_t): Remove rotate. * subversion/libsvn_delta/compat.c (rotate_cb): Remove. (svn_delta__editor_from_delta): Remove rotate. * subversion/libsvn_delta/editor.c (svn_editor_setcb_rotate, svn_editor_rotate): Remove. (svn_editor_setcb_many): Remove rotate. * subversion/libsvn_fs/editor.c (rotate_cb): Remove. (make_editor): Remove rotate. * subversion/libsvn_repos/commit.c (rotate_cb): Remove. (svn_repos__get_commit_ev2): Remove rotate. * subversion/libsvn_wc/wc_db_update_move.c (tc_editor_rotate): Remove. (editor_ops): Remove rotate. * notes/ev2-callbacks-template.c (rotate_cb): Remove. (make_editor): Remove rotate. [in subversion/bindings/javahl] * native/CommitEditor.cpp (CommitEditor::rotate): Remove commented-out code. * native/CommitEditor.h (CommitEditor::rotate): Remove commented-out code. * native/EditorProxy.cpp (EditorProxy::EditorProxy): Remove rotate. (EditorProxy::cb_rotate): Remove. * native/EditorProxy.h (EditorProxy::cb_rotate): Remove. * native/org_apache_subversion_javahl_remote_CommitEditor.cpp (Java_org_apache_subversion_javahl_remote_CommitEditor_rotate): Remove commented-out code. * src/org/apache/subversion/javahl/ISVNEditor.java (rotate, RotatePair): Remove commented-out code. * src/org/apache/subversion/javahl/remote/CommitEditor.java (rotate): Remove commented-out code. * tests/org/apache/subversion/javahl/SVNRemoteTests.java (testEditorRotate, testEditorNotImplemented): Remove commented-out code. Modified: subversion/trunk/notes/ev2-callbacks-template.c subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java subversion/trunk/subversion/include/private/svn_editor.h subversion/trunk/subversion/libsvn_delta/compat.c subversion/trunk/subversion/libsvn_delta/editor.c subversion/trunk/subversion/libsvn_fs/editor.c subversion/trunk/subversion/libsvn_repos/commit.c subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Modified: subversion/trunk/notes/ev2-callbacks-template.c URL: http://svn.apache.org/viewvc/subversion/trunk/notes/ev2-callbacks-template.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/notes/ev2-callbacks-template.c (original) +++ subversion/trunk/notes/ev2-callbacks-template.c Wed Sep 4 09:46:12 2013 @@ -155,19 +155,6 @@ move_cb(void *baton, } -/* This implements svn_editor_cb_rotate_t */ -static svn_error_t * -rotate_cb(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool) -{ - struct edit_baton *eb = baton; - - UNUSED(eb); SVN__NOT_IMPLEMENTED(); -} - - /* This implements svn_editor_cb_complete_t */ static svn_error_t * complete_cb(void *baton, @@ -208,7 +195,6 @@ make_editor(svn_editor_t **editor, delete_cb, copy_cb, move_cb, - rotate_cb, complete_cb, abort_cb }; Modified: subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp Wed Sep 4 09:46:12 2013 @@ -452,21 +452,6 @@ void CommitEditor::move(jstring jsrc_rel svn_revnum_t(jreplaces_revision)),); } -// void CommitEditor::rotate(jobject jelements) -// { -// if (!m_valid) { throw_editor_inactive(); return; } -// SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),); -// -// SVN::Pool subPool(pool); -// const apr_array_header_t* relpaths; -// const apr_array_header_t* revisions; -// build_rotation(&relpaths, &revisions, jelements, subPool); -// if (JNIUtil::isJavaExceptionThrown()) -// return; -// -// SVN_JNI_ERR(svn_editor_rotate(m_editor, relpaths, revisions),); -// } - void CommitEditor::complete() { if (!m_valid) { throw_editor_inactive(); return; } Modified: subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h (original) +++ subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h Wed Sep 4 09:46:12 2013 @@ -81,7 +81,6 @@ public: jstring jdst_relpath, jlong jreplaces_revision); void move(jstring jsrc_relpath, jlong jsrc_revision, jstring jdst_relpath, jlong jreplaces_revision); - // void rotate(jobject jelements); void complete(); void abort(); Modified: subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp Wed Sep 4 09:46:12 2013 @@ -55,7 +55,7 @@ EditorProxy::EditorProxy(jobject jeditor static const svn_editor_cb_many_t editor_many_cb = { cb_add_directory, cb_add_file, cb_add_symlink, cb_add_absent, cb_alter_directory, cb_alter_file, cb_alter_symlink, - cb_delete, cb_copy, cb_move, cb_rotate, + cb_delete, cb_copy, cb_move, cb_complete, cb_abort }; @@ -473,15 +473,6 @@ EditorProxy::cb_move(void *baton, } svn_error_t* -EditorProxy::cb_rotate(void*, - const apr_array_header_t*, - const apr_array_header_t*, - apr_pool_t*) -{ - return svn_error_create(APR_ENOTIMPL, NULL, "EditorProxy::cb_rotate"); -} - -svn_error_t* EditorProxy::cb_complete(void *baton, apr_pool_t *scratch_pool) { //DEBUG:fprintf(stderr, " (n) EditorProxy::cb_complete()\n"); Modified: subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h (original) +++ subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h Wed Sep 4 09:46:12 2013 @@ -129,10 +129,6 @@ private: const char *dst_relpath, svn_revnum_t replaces_rev, apr_pool_t *scratch_pool); - static svn_error_t* cb_rotate(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool); static svn_error_t* cb_complete(void *baton, apr_pool_t *scratch_pool); static svn_error_t* cb_abort(void *baton, Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp Wed Sep 4 09:46:12 2013 @@ -182,16 +182,6 @@ Java_org_apache_subversion_javahl_remote editor->move(jsrc_relpath, jsrc_revision, jdst_relpath, jreplaces_revision); } -//JNIEXPORT void JNICALL -//Java_org_apache_subversion_javahl_remote_CommitEditor_rotate( -// JNIEnv* env, jobject jthis, jobject jelements) -//{ -// JNIEntry(CommitEditor, rotate); -// CommitEditor *editor = CommitEditor::getCppObject(jthis); -// CPPADDR_NULL_PTR(editor,); -// editor->rotate(jelements); -//} - JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_remote_CommitEditor_complete( JNIEnv* env, jobject jthis) Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java (original) +++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java Wed Sep 4 09:46:12 2013 @@ -261,8 +261,7 @@ public interface ISVNEditor * sourceRelativePath at the start of the whole edit * andsourceRelativePath at * sourceRevision must lie within the same node-rev - * (aka history-segment). This is just like the #delete() and - * #rotate(). + * (aka history-segment). This is just like the #delete(). *

* For a description of replacesRevision, see #addFile(). * @@ -274,42 +273,6 @@ public interface ISVNEditor long replacesRevision) throws ClientException; -// Not implemented in the native API -// /** -// * Perform a rotation among multiple nodes in the target tree. -// *

-// * The elements list specifies the 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 -// * elements will be moved to the relative path -// * specified at index 1 of elements. 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 relative path 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. -// * -// * @throws ClientException -// */ -// void rotate(Iterable elements) throws ClientException; -// -// public static final class RotatePair -// { -// public RotatePair(String relativePath, long revision) -// { -// this.relativePath = relativePath; -// this.revision = revision; -// } -// public final String relativePath; -// public final long revision; -// } - /** * Signal that the edit has been completed successfully. * After this method is called, the editor is considered closed. Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java (original) +++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java Wed Sep 4 09:46:12 2013 @@ -111,9 +111,6 @@ public class CommitEditor extends JNIObj long replacesRevision) throws ClientException; -// public native void rotate(Iterable elements) -// throws ClientException; - public native void complete() throws ClientException; public native void abort() throws ClientException; Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original) +++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Wed Sep 4 09:46:12 2013 @@ -631,48 +631,6 @@ public class SVNRemoteTests extends SVNT assertTrue(Arrays.equals(contents, checkcontents.toByteArray())); } - // public void testEditorRotate() throws Exception - // { - // ISVNRemote session = getSession(); - // - // ArrayList rotation = - // new ArrayList(3); - // rotation.add(new ISVNEditor.RotatePair("A/B", 1)); - // rotation.add(new ISVNEditor.RotatePair("A/C", 1)); - // rotation.add(new ISVNEditor.RotatePair("A/D", 1)); - // - // CommitContext cc = - // new CommitContext(session, "Rotate A/B -> A/C -> A/D"); - // try { - // // No alter-dir of A is needed, children remain the same. - // cc.editor.rotate(rotation); - // cc.editor.complete(); - // } finally { - // cc.editor.dispose(); - // } - // - // assertEquals(2, cc.getRevision()); - // assertEquals(2, session.getLatestRevision()); - // - // HashMap dirents = new HashMap(); - // HashMap properties = new HashMap(); - // - // // A/B is now what used to be A/D, so A/B/H must exist - // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/B", - // DirEntry.Fields.all, dirents, properties); - // assertEquals(dirents.get("H").getPath(), "H"); - // - // // A/C is now what used to be A/B, so A/C/F must exist - // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/C", - // DirEntry.Fields.all, dirents, properties); - // assertEquals(dirents.get("F").getPath(), "F"); - // - // // A/D is now what used to be A/C and must be empty - // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/D", - // DirEntry.Fields.all, dirents, properties); - // assertTrue(dirents.isEmpty()); - // } - // Sanity check so that we don't forget about unimplemented methods. public void testEditorNotImplemented() throws Exception { @@ -702,13 +660,6 @@ public class SVNRemoteTests extends SVNT } assertEquals("Not implemented: CommitEditor.alterSymlink", exmsg); - // try { - // exmsg = ""; - // cc.editor.rotate(rotation); - // } catch (RuntimeException ex) { - // exmsg = ex.getMessage(); - // } - // assertEquals("Not implemented: CommitEditor.rotate", exmsg); } finally { cc.editor.dispose(); } Modified: subversion/trunk/subversion/include/private/svn_editor.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_editor.h?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/include/private/svn_editor.h (original) +++ subversion/trunk/subversion/include/private/svn_editor.h Wed Sep 4 09:46:12 2013 @@ -270,7 +270,6 @@ svn_delta_shim_callbacks_default(apr_poo * 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_poo * 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_poo * 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,7 +342,7 @@ svn_delta_shim_callbacks_default(apr_poo * 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 @@ -352,7 +350,7 @@ svn_delta_shim_callbacks_default(apr_poo * destinations, so they may not be referenced again in an add_* or a * deletion; these paths may have alter_* operations applied. * - * - 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 +373,6 @@ svn_delta_shim_callbacks_default(apr_poo * 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 @@ -620,15 +614,6 @@ typedef svn_error_t *(*svn_editor_cb_mov 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 +775,6 @@ svn_editor_setcb_move(svn_editor_t *edit 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 +815,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; @@ -1093,7 +1066,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 +1083,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. Modified: subversion/trunk/subversion/libsvn_delta/compat.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_delta/compat.c (original) +++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Sep 4 09:46:12 2013 @@ -1330,17 +1330,6 @@ move_cb(void *baton, return SVN_NO_ERROR; } -/* This implements svn_editor_cb_rotate_t */ -static svn_error_t * -rotate_cb(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool) -{ - SVN__NOT_IMPLEMENTED(); -} - - static int count_components(const char *relpath) { @@ -1888,7 +1877,6 @@ svn_delta__editor_from_delta(svn_editor_ delete_cb, copy_cb, move_cb, - rotate_cb, complete_cb, abort_cb }; Modified: subversion/trunk/subversion/libsvn_delta/editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/editor.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_delta/editor.c (original) +++ subversion/trunk/subversion/libsvn_delta/editor.c Wed Sep 4 09:46:12 2013 @@ -391,16 +391,6 @@ svn_editor_setcb_move(svn_editor_t *edit svn_error_t * -svn_editor_setcb_rotate(svn_editor_t *editor, - svn_editor_cb_rotate_t callback, - apr_pool_t *scratch_pool) -{ - editor->funcs.cb_rotate = callback; - return SVN_NO_ERROR; -} - - -svn_error_t * svn_editor_setcb_complete(svn_editor_t *editor, svn_editor_cb_complete_t callback, apr_pool_t *scratch_pool) @@ -437,7 +427,6 @@ svn_editor_setcb_many(svn_editor_t *edit COPY_CALLBACK(cb_delete); COPY_CALLBACK(cb_copy); COPY_CALLBACK(cb_move); - COPY_CALLBACK(cb_rotate); COPY_CALLBACK(cb_complete); COPY_CALLBACK(cb_abort); @@ -862,56 +851,6 @@ svn_editor_move(svn_editor_t *editor, svn_error_t * -svn_editor_rotate(svn_editor_t *editor, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions) -{ - svn_error_t *err = SVN_NO_ERROR; - - SHOULD_NOT_BE_FINISHED(editor); -#ifdef ENABLE_ORDERING_CHECK - { - int i; - for (i = 0; i < relpaths->nelts; i++) - { - const char *relpath = APR_ARRAY_IDX(relpaths, i, const char *); - - SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); - SHOULD_NOT_BE_COMPLETED(editor, relpath); - VERIFY_PARENT_MAY_EXIST(editor, relpath); - CHILD_DELETIONS_ALLOWED(editor, relpath); - } - } -#endif - - SVN_ERR(check_cancel(editor)); - - if (editor->funcs.cb_rotate) - { - START_CALLBACK(editor); - err = editor->funcs.cb_rotate(editor->baton, relpaths, revisions, - editor->scratch_pool); - END_CALLBACK(editor); - } - -#ifdef ENABLE_ORDERING_CHECK - { - int i; - for (i = 0; i < relpaths->nelts; i++) - { - const char *relpath = APR_ARRAY_IDX(relpaths, i, const char *); - MARK_ALLOW_ALTER(editor, relpath); - MARK_PARENT_STABLE(editor, relpath); - } - } -#endif - - svn_pool_clear(editor->scratch_pool); - return svn_error_trace(err); -} - - -svn_error_t * svn_editor_complete(svn_editor_t *editor) { svn_error_t *err = SVN_NO_ERROR; Modified: subversion/trunk/subversion/libsvn_fs/editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/editor.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs/editor.c (original) +++ subversion/trunk/subversion/libsvn_fs/editor.c Wed Sep 4 09:46:12 2013 @@ -177,7 +177,7 @@ can_modify(svn_fs_root_t *txn_root, SVN_ERR(svn_fs_node_created_rev(&created_rev, txn_root, fspath, scratch_pool)); - /* Uncommitted nodes (eg. a descendent of a copy/move/rotate destination) + /* Uncommitted nodes (eg. a descendent of a copy/move destination) have no (committed) revision number. Let the caller go ahead and modify these nodes. @@ -195,7 +195,7 @@ can_modify(svn_fs_root_t *txn_root, have supplied a valid revision number [that they expect to change]. The checks further below will determine the out-of-dateness of the specified revision. */ - /* ### ugh. descendents of copy/move/rotate destinations carry along + /* ### ugh. descendents of copy/move destinations carry along ### their original immutable state and (thus) a valid CREATED_REV. ### but they are logically uncommitted, so the caller will pass ### SVN_INVALID_REVNUM. (technically, the caller could provide @@ -205,7 +205,7 @@ can_modify(svn_fs_root_t *txn_root, ### for now, we will assume the caller knows what they are doing ### and an invalid revision implies such a descendent. in the ### future, we could examine the ancestor chain looking for a - ### copy/move/rotate-here node and allow the modification (and the + ### copy/move-here node and allow the modification (and the ### converse: if no such ancestor, the caller must specify the ### correct/intended revision to modify). */ @@ -299,7 +299,7 @@ can_create(svn_fs_root_t *txn_root, ### test the ancestor to determine if it has been *-here in this ### txn, or just a simple modification. */ - /* Are any of the parents copied/moved/rotated-here? */ + /* Are any of the parents copied/moved-here? */ for (cur_fspath = fspath; strlen(cur_fspath) > 1; /* not the root */ cur_fspath = svn_fspath__dirname(cur_fspath, scratch_pool)) @@ -633,19 +633,6 @@ move_cb(void *baton, } -/* This implements svn_editor_cb_rotate_t */ -static svn_error_t * -rotate_cb(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool) -{ - struct edit_baton *eb = baton; - - UNUSED(eb); SVN__NOT_IMPLEMENTED(); -} - - /* This implements svn_editor_cb_complete_t */ static svn_error_t * complete_cb(void *baton, @@ -714,7 +701,6 @@ make_editor(svn_editor_t **editor, delete_cb, copy_cb, move_cb, - rotate_cb, complete_cb, abort_cb }; Modified: subversion/trunk/subversion/libsvn_repos/commit.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/commit.c (original) +++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Sep 4 09:46:12 2013 @@ -1198,20 +1198,6 @@ move_cb(void *baton, } -/* This implements svn_editor_cb_rotate_t */ -static svn_error_t * -rotate_cb(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool) -{ - struct ev2_baton *eb = baton; - - SVN_ERR(svn_editor_rotate(eb->inner, relpaths, revisions)); - return SVN_NO_ERROR; -} - - /* This implements svn_editor_cb_complete_t */ static svn_error_t * complete_cb(void *baton, @@ -1333,7 +1319,6 @@ svn_repos__get_commit_ev2(svn_editor_t * delete_cb, copy_cb, move_cb, - rotate_cb, complete_cb, abort_cb }; Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1519958&r1=1519957&r2=1519958&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Sep 4 09:46:12 2013 @@ -1297,15 +1297,6 @@ tc_editor_move(void *baton, } static svn_error_t * -tc_editor_rotate(void *baton, - const apr_array_header_t *relpaths, - const apr_array_header_t *revisions, - apr_pool_t *scratch_pool) -{ - return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, NULL); -} - -static svn_error_t * tc_editor_complete(void *baton, apr_pool_t *scratch_pool) { @@ -1331,7 +1322,6 @@ static const svn_editor_cb_many_t editor tc_editor_delete, tc_editor_copy, tc_editor_move, - tc_editor_rotate, tc_editor_complete, tc_editor_abort };