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 C29504CF2 for ; Wed, 15 Jun 2011 10:33:53 +0000 (UTC) Received: (qmail 73088 invoked by uid 500); 15 Jun 2011 10:33:53 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 73000 invoked by uid 500); 15 Jun 2011 10:33:53 -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 72993 invoked by uid 99); 15 Jun 2011 10:33:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2011 10:33:53 +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, 15 Jun 2011 10:33:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B5B9D23889DA; Wed, 15 Jun 2011 10:33:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1135990 - in /subversion/trunk/subversion: include/svn_mergeinfo.h libsvn_client/mergeinfo.c libsvn_fs_base/tree.c libsvn_fs_fs/tree.c Date: Wed, 15 Jun 2011 10:33:29 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110615103329.B5B9D23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Wed Jun 15 10:33:29 2011 New Revision: 1135990 URL: http://svn.apache.org/viewvc?rev=1135990&view=rev Log: Fully deprecate some half-deprecated mergeinfo functions. * subversion/include/svn_mergeinfo.h (svn_rangelist_inheritable, svn_mergeinfo_inheritable): Deprecate. (Their implementations are already in libsvn_subr/deprecated.c.) * subversion/libsvn_client/mergeinfo.c (svn_client__get_wc_mergeinfo): Update to use svn_mergeinfo_inheritable2() instead of svn_mergeinfo_inheritable(). * subversion/libsvn_fs_base/tree.c (txn_body_get_mergeinfo_for_path): Same. * subversion/libsvn_fs_fs/tree.c (get_mergeinfo_for_path): Same. Modified: subversion/trunk/subversion/include/svn_mergeinfo.h subversion/trunk/subversion/libsvn_client/mergeinfo.c subversion/trunk/subversion/libsvn_fs_base/tree.c subversion/trunk/subversion/libsvn_fs_fs/tree.c Modified: subversion/trunk/subversion/include/svn_mergeinfo.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_mergeinfo.h?rev=1135990&r1=1135989&r2=1135990&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_mergeinfo.h (original) +++ subversion/trunk/subversion/include/svn_mergeinfo.h Wed Jun 15 10:33:29 2011 @@ -410,7 +410,9 @@ svn_rangelist_inheritable2(apr_array_hea /** Like svn_rangelist_inheritable2, but always finds inheritable ranges. * * @since New in 1.5. + * @deprecated Provided for backward compatibility with the 1.6 API. */ +SVN_DEPRECATED svn_error_t * svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist, const apr_array_header_t *rangelist, @@ -445,7 +447,9 @@ svn_mergeinfo_inheritable2(svn_mergeinfo /** Like svn_mergeinfo_inheritable2, but always finds inheritable mergeinfo. * * @since New in 1.5. + * @deprecated Provided for backward compatibility with the 1.6 API. */ +SVN_DEPRECATED svn_error_t * svn_mergeinfo_inheritable(svn_mergeinfo_t *inheritable_mergeinfo, svn_mergeinfo_t mergeinfo, Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1135990&r1=1135989&r2=1135990&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original) +++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Jun 15 10:33:29 2011 @@ -317,8 +317,9 @@ svn_client__get_wc_mergeinfo(svn_mergein if (*inherited && apr_hash_count(*mergeinfo)) /* Nothing to do for empty mergeinfo. */ { - SVN_ERR(svn_mergeinfo_inheritable(mergeinfo, *mergeinfo, NULL, - SVN_INVALID_REVNUM, SVN_INVALID_REVNUM, result_pool)); + SVN_ERR(svn_mergeinfo_inheritable2(mergeinfo, *mergeinfo, NULL, + SVN_INVALID_REVNUM, SVN_INVALID_REVNUM, + TRUE, result_pool, scratch_pool)); svn_mergeinfo__remove_empty_rangelists(*mergeinfo, result_pool); } Modified: subversion/trunk/subversion/libsvn_fs_base/tree.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/tree.c?rev=1135990&r1=1135989&r2=1135990&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_base/tree.c (original) +++ subversion/trunk/subversion/libsvn_fs_base/tree.c Wed Jun 15 10:33:29 2011 @@ -5411,10 +5411,10 @@ txn_body_get_mergeinfo_for_path(void *ba } else { - SVN_ERR(svn_mergeinfo_inheritable(&tmp_mergeinfo, - tmp_mergeinfo, - NULL, SVN_INVALID_REVNUM, - SVN_INVALID_REVNUM, trail->pool)); + SVN_ERR(svn_mergeinfo_inheritable2(&tmp_mergeinfo, tmp_mergeinfo, + NULL, SVN_INVALID_REVNUM, + SVN_INVALID_REVNUM, TRUE, + trail->pool, trail->pool)); SVN_ERR(append_to_merged_froms(args->mergeinfo, tmp_mergeinfo, parent_path_relpath(parent_path, Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1135990&r1=1135989&r2=1135990&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original) +++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Wed Jun 15 10:33:29 2011 @@ -3726,11 +3726,10 @@ get_mergeinfo_for_path(svn_mergeinfo_t * } else { - SVN_ERR(svn_mergeinfo_inheritable(&temp_mergeinfo, - temp_mergeinfo, - NULL, SVN_INVALID_REVNUM, - SVN_INVALID_REVNUM, - scratch_pool)); + SVN_ERR(svn_mergeinfo_inheritable2(&temp_mergeinfo, temp_mergeinfo, + NULL, SVN_INVALID_REVNUM, + SVN_INVALID_REVNUM, TRUE, + scratch_pool, scratch_pool)); SVN_ERR(append_to_merged_froms(mergeinfo, temp_mergeinfo,