Author: cmpilato
Date: Tue Mar 22 14:01:56 2011
New Revision: 1084185
URL: http://svn.apache.org/viewvc?rev=1084185&view=rev
Log:
Follow-up to r1083896, restoring a bit of cancellation granularity
accidentally lost.
* subversion/libsvn_client/commit_util.c
(harvest_committables): Check for cancellation while iterating over
locked-item URL lookups.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1084185&r1=1084184&r2=1084185&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Tue Mar 22 14:01:56
2011
@@ -814,6 +814,9 @@ harvest_committables(apr_hash_t *committ
const char *item_url;
apr_pool_t *token_pool = apr_hash_pool_get(lock_tokens);
+ if (ctx->cancel_func)
+ SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
+
SVN_ERR(svn_wc__node_get_url(&item_url, ctx->wc_ctx, item_abspath,
token_pool, scratch_pool));
if (item_url)
