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 E4D519C67 for ; Tue, 21 Feb 2012 21:44:34 +0000 (UTC) Received: (qmail 76039 invoked by uid 500); 21 Feb 2012 21:44:34 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 76009 invoked by uid 500); 21 Feb 2012 21:44:34 -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 76002 invoked by uid 99); 21 Feb 2012 21:44:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 21:44:34 +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; Tue, 21 Feb 2012 21:44:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CEB672388C63 for ; Tue, 21 Feb 2012 21:44:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1292047 - in /subversion/trunk/subversion/libsvn_client: add.c copy.c delete.c prop_commands.c Date: Tue, 21 Feb 2012 21:44:13 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221214413.CEB672388C63@eris.apache.org> Author: hwright Date: Tue Feb 21 21:44:13 2012 New Revision: 1292047 URL: http://svn.apache.org/viewvc?rev=1292047&view=rev Log: Ev2 shims: Register the appropriate callbacks for use with the Ev2 shims every time we fetch a commit editor from within the client. * subversion/libsvn_client/add.c (mkdir_urls): Register editor shim callbacks. * subversion/libsvn_client/prop_commands.c (propset_on_url): Same. * subversion/libsvn_client/copy.c (repos_to_repos_copy, wc_to_repos_copy): Same. * subversion/libsvn_client/delete.c (single_repos_delete): Same. Modified: subversion/trunk/subversion/libsvn_client/add.c subversion/trunk/subversion/libsvn_client/copy.c subversion/trunk/subversion/libsvn_client/delete.c subversion/trunk/subversion/libsvn_client/prop_commands.c Modified: subversion/trunk/subversion/libsvn_client/add.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=1292047&r1=1292046&r2=1292047&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/add.c (original) +++ subversion/trunk/subversion/libsvn_client/add.c Tue Feb 21 21:44:13 2012 @@ -47,6 +47,7 @@ #include "private/svn_client_private.h" #include "private/svn_wc_private.h" +#include "private/svn_ra_private.h" #include "private/svn_magic.h" #include "svn_private_config.h" @@ -896,6 +897,9 @@ mkdir_urls(const apr_array_header_t *url ctx, pool)); /* Fetch RA commit editor */ + SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session, + svn_client__get_shim_callbacks(ctx->wc_ctx, + NULL, pool))); SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton, commit_revprops, commit_callback, Modified: subversion/trunk/subversion/libsvn_client/copy.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1292047&r1=1292046&r2=1292047&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/copy.c (original) +++ subversion/trunk/subversion/libsvn_client/copy.c Tue Feb 21 21:44:13 2012 @@ -44,6 +44,7 @@ #include "svn_private_config.h" #include "private/svn_wc_private.h" +#include "private/svn_ra_private.h" #include "private/svn_mergeinfo_private.h" @@ -1089,6 +1090,9 @@ repos_to_repos_copy(const apr_array_head message, ctx, pool)); /* Fetch RA commit editor. */ + SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session, + svn_client__get_shim_callbacks(ctx->wc_ctx, + NULL, pool))); SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton, commit_revprops, commit_callback, @@ -1401,6 +1405,9 @@ wc_to_repos_copy(const apr_array_header_ FALSE, FALSE, ctx, pool)); /* Fetch RA commit editor. */ + SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session, + svn_client__get_shim_callbacks(ctx->wc_ctx, + NULL, pool))); SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton, commit_revprops, commit_callback, Modified: subversion/trunk/subversion/libsvn_client/delete.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1292047&r1=1292046&r2=1292047&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/delete.c (original) +++ subversion/trunk/subversion/libsvn_client/delete.c Tue Feb 21 21:44:13 2012 @@ -39,6 +39,7 @@ #include "private/svn_client_private.h" #include "private/svn_wc_private.h" +#include "private/svn_ra_private.h" #include "svn_private_config.h" @@ -187,6 +188,9 @@ single_repos_delete(svn_ra_session_t *ra log_msg, ctx, pool)); /* Fetch RA commit editor */ + SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session, + svn_client__get_shim_callbacks(ctx->wc_ctx, + NULL, pool))); SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton, commit_revprops, commit_callback, Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1292047&r1=1292046&r2=1292047&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/prop_commands.c (original) +++ subversion/trunk/subversion/libsvn_client/prop_commands.c Tue Feb 21 21:44:13 2012 @@ -41,6 +41,7 @@ #include "svn_private_config.h" #include "private/svn_wc_private.h" +#include "private/svn_ra_private.h" #include "private/svn_client_private.h" @@ -242,6 +243,9 @@ propset_on_url(const char *propname, message, ctx, pool)); /* Fetch RA commit editor. */ + SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session, + svn_client__get_shim_callbacks(ctx->wc_ctx, + NULL, pool))); SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton, commit_revprops, commit_callback,