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 0A0006B73 for ; Thu, 21 Jul 2011 15:06:32 +0000 (UTC) Received: (qmail 54142 invoked by uid 500); 21 Jul 2011 15:06:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 54068 invoked by uid 500); 21 Jul 2011 15:06:31 -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 54061 invoked by uid 99); 21 Jul 2011 15:06:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 15:06:31 +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; Thu, 21 Jul 2011 15:06:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B037923888CF for ; Thu, 21 Jul 2011 15:06:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149210 - /subversion/trunk/subversion/libsvn_client/externals.c Date: Thu, 21 Jul 2011 15:06:09 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110721150609.B037923888CF@eris.apache.org> Author: rhuijben Date: Thu Jul 21 15:06:08 2011 New Revision: 1149210 URL: http://svn.apache.org/viewvc?rev=1149210&view=rev Log: * subversion/libsvn_client/externals.c (handle_externals_change): Check for cancellation in this long loop to allow breaking the loop from cancel functions. This allows cancelation for cancel functions that don't return SVN_ERR_CANCELLED and for cancellations that are wrapped by the update handling. Modified: subversion/trunk/subversion/libsvn_client/externals.c Modified: subversion/trunk/subversion/libsvn_client/externals.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1149210&r1=1149209&r2=1149210&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/externals.c (original) +++ subversion/trunk/subversion/libsvn_client/externals.c Thu Jul 21 15:06:08 2011 @@ -1044,6 +1044,9 @@ handle_externals_change(const struct ext svn_pool_clear(iterpool); + if (eb->ctx->cancel_func) + SVN_ERR(eb->ctx->cancel_func(eb->ctx->cancel_baton)); + target_abspath = svn_dirent_join(local_abspath, new_item->target_dir, iterpool);