Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 80173 invoked from network); 4 Nov 2010 12:24:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Nov 2010 12:24:37 -0000 Received: (qmail 67853 invoked by uid 500); 4 Nov 2010 12:25:09 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 67760 invoked by uid 500); 4 Nov 2010 12:25:06 -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 67747 invoked by uid 99); 4 Nov 2010 12:25:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Nov 2010 12:25:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 04 Nov 2010 12:25:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 801882388903; Thu, 4 Nov 2010 12:23:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1030902 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/copy.c libsvn_client/merge.c libsvn_wc/adm_ops.c libsvn_wc/deprecated.c libsvn_wc/update_editor.c Date: Thu, 04 Nov 2010 12:23:50 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101104122350.801882388903@eris.apache.org> Author: julianfoad Date: Thu Nov 4 12:23:49 2010 New Revision: 1030902 URL: http://svn.apache.org/viewvc?rev=1030902&view=rev Log: Remove the (unused) notification parameters from svn_wc_add_repos_file4(). * subversion/include/svn_wc.h, subversion/libsvn_wc/update_editor.c (svn_wc_add_repos_file4): Remove the (unused) notification parameters. * subversion/libsvn_client/copy.c (repos_to_wc_copy_single): Adjust calls. * subversion/libsvn_client/merge.c (merge_file_added): Adjust calls. * subversion/libsvn_wc/adm_ops.c (svn_wc_add4): Adjust calls. * subversion/libsvn_wc/deprecated.c (svn_wc_add_repos_file3): Adjust calls. Modified: subversion/trunk/subversion/include/svn_wc.h subversion/trunk/subversion/libsvn_client/copy.c subversion/trunk/subversion/libsvn_client/merge.c subversion/trunk/subversion/libsvn_wc/adm_ops.c subversion/trunk/subversion/libsvn_wc/deprecated.c subversion/trunk/subversion/libsvn_wc/update_editor.c Modified: subversion/trunk/subversion/include/svn_wc.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_wc.h (original) +++ subversion/trunk/subversion/include/svn_wc.h Thu Nov 4 12:23:49 2010 @@ -4391,8 +4391,6 @@ svn_wc_add(const char *path, * * Use @a scratch_pool for temporary allocations. * - * ### NOTE: the notification callback/baton is not yet used. - * * ### This function is very redundant with svn_wc_add(). Ideally, * we'd merge them, so that svn_wc_add() would just take optional * new_props and optional copyfrom information. That way it could be @@ -4418,13 +4416,13 @@ svn_wc_add_repos_file4(svn_wc_context_t svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, - svn_wc_notify_func2_t notify_func, - void *notify_baton, apr_pool_t *scratch_pool); /** Similar to svn_wc_add_repos_file4, but uses access batons and a * relative path instead of a working copy context and absolute path. * + * ### NOTE: the notification callback/baton is not yet used. + * * @since New in 1.6. * @deprecated Provided for compatibility with the 1.6 API. */ Modified: subversion/trunk/subversion/libsvn_client/copy.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/copy.c (original) +++ subversion/trunk/subversion/libsvn_client/copy.c Thu Nov 4 12:23:49 2010 @@ -1496,7 +1496,6 @@ repos_to_wc_copy_single(svn_client__copy same_repositories ? pair->src_abspath_or_url : NULL, same_repositories ? pair->src_revnum : SVN_INVALID_REVNUM, ctx->cancel_func, ctx->cancel_baton, - ctx->notify_func2, ctx->notify_baton2, pool)); } Modified: subversion/trunk/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Nov 4 12:23:49 2010 @@ -1723,13 +1723,13 @@ merge_file_added(const char *local_dir_a copying 'yours' to 'mine', isn't enough; we need to get the whole text-base and props installed too, just as if we had called 'svn cp wc wc'. */ - /* ### would be nice to have cancel/notify funcs to pass */ + /* ### would be nice to have a cancellation func to pass */ SVN_ERR(svn_wc_add_repos_file4( merge_b->ctx->wc_ctx, mine_abspath, new_base_contents, new_contents, new_base_props, new_props, copyfrom_url, copyfrom_rev, - NULL, NULL, NULL, NULL, subpool)); + NULL, NULL, subpool)); /* ### delete 'yours' ? */ } Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original) +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Nov 4 12:23:49 2010 @@ -1119,7 +1119,7 @@ svn_wc_add4(svn_wc_context_t *wc_ctx, content, NULL, NULL, NULL, copyfrom_url, copyfrom_rev, cancel_func, cancel_baton, - NULL, NULL, scratch_pool)); + scratch_pool)); } else SVN_ERR(svn_wc__db_op_copy_dir(db, local_abspath, Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/deprecated.c (original) +++ subversion/trunk/subversion/libsvn_wc/deprecated.c Thu Nov 4 12:23:49 2010 @@ -2729,7 +2729,6 @@ svn_wc_add_repos_file3(const char *dst_p copyfrom_url, copyfrom_rev, cancel_func, cancel_baton, - notify_func, notify_baton, pool)); return svn_error_return(svn_wc_context_destroy(wc_ctx)); Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1030902&r1=1030901&r2=1030902&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Nov 4 12:23:49 2010 @@ -5522,8 +5522,6 @@ svn_wc_add_repos_file4(svn_wc_context_t svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, - svn_wc_notify_func2_t notify_func, - void *notify_baton, apr_pool_t *scratch_pool) { svn_wc__db_t *db = wc_ctx->db;