1251881Speter/* 2251881Speter * resolved.c: wrapper around wc resolved functionality. 3251881Speter * 4251881Speter * ==================================================================== 5251881Speter * Licensed to the Apache Software Foundation (ASF) under one 6251881Speter * or more contributor license agreements. See the NOTICE file 7251881Speter * distributed with this work for additional information 8251881Speter * regarding copyright ownership. The ASF licenses this file 9251881Speter * to you under the Apache License, Version 2.0 (the 10251881Speter * "License"); you may not use this file except in compliance 11251881Speter * with the License. You may obtain a copy of the License at 12251881Speter * 13251881Speter * http://www.apache.org/licenses/LICENSE-2.0 14251881Speter * 15251881Speter * Unless required by applicable law or agreed to in writing, 16251881Speter * software distributed under the License is distributed on an 17251881Speter * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 18251881Speter * KIND, either express or implied. See the License for the 19251881Speter * specific language governing permissions and limitations 20251881Speter * under the License. 21251881Speter * ==================================================================== 22251881Speter */ 23251881Speter 24251881Speter/* ==================================================================== */ 25251881Speter 26251881Speter 27251881Speter 28251881Speter/*** Includes. ***/ 29251881Speter 30251881Speter#include <stdlib.h> 31251881Speter 32251881Speter#include "svn_types.h" 33251881Speter#include "svn_wc.h" 34251881Speter#include "svn_client.h" 35251881Speter#include "svn_error.h" 36251881Speter#include "svn_dirent_uri.h" 37251881Speter#include "svn_path.h" 38251881Speter#include "svn_pools.h" 39251881Speter#include "svn_hash.h" 40251881Speter#include "svn_sorts.h" 41251881Speter#include "client.h" 42251881Speter#include "private/svn_wc_private.h" 43251881Speter 44251881Speter#include "svn_private_config.h" 45251881Speter 46251881Speter/*** Code. ***/ 47251881Speter 48251881Spetersvn_error_t * 49251881Spetersvn_client__resolve_conflicts(svn_boolean_t *conflicts_remain, 50251881Speter apr_hash_t *conflicted_paths, 51251881Speter svn_client_ctx_t *ctx, 52251881Speter apr_pool_t *scratch_pool) 53251881Speter{ 54251881Speter apr_pool_t *iterpool = svn_pool_create(scratch_pool); 55251881Speter apr_array_header_t *array; 56251881Speter int i; 57251881Speter 58251881Speter if (conflicts_remain) 59251881Speter *conflicts_remain = FALSE; 60251881Speter 61251881Speter SVN_ERR(svn_hash_keys(&array, conflicted_paths, scratch_pool)); 62251881Speter qsort(array->elts, array->nelts, array->elt_size, 63251881Speter svn_sort_compare_paths); 64251881Speter 65251881Speter for (i = 0; i < array->nelts; i++) 66251881Speter { 67251881Speter const char *local_abspath = APR_ARRAY_IDX(array, i, const char *); 68251881Speter 69251881Speter svn_pool_clear(iterpool); 70251881Speter SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath, 71251881Speter svn_depth_empty, 72251881Speter TRUE /* resolve_text */, 73251881Speter "" /* resolve_prop (ALL props) */, 74251881Speter TRUE /* resolve_tree */, 75251881Speter svn_wc_conflict_choose_unspecified, 76251881Speter ctx->conflict_func2, 77251881Speter ctx->conflict_baton2, 78251881Speter ctx->cancel_func, ctx->cancel_baton, 79251881Speter ctx->notify_func2, ctx->notify_baton2, 80251881Speter iterpool)); 81251881Speter 82251881Speter if (conflicts_remain) 83251881Speter { 84251881Speter svn_error_t *err; 85251881Speter svn_boolean_t text_c, prop_c, tree_c; 86251881Speter 87251881Speter err = svn_wc_conflicted_p3(&text_c, &prop_c, &tree_c, 88251881Speter ctx->wc_ctx, local_abspath, 89251881Speter iterpool); 90251881Speter if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND) 91251881Speter { 92251881Speter svn_error_clear(err); 93251881Speter text_c = prop_c = tree_c = FALSE; 94251881Speter } 95251881Speter else 96251881Speter { 97251881Speter SVN_ERR(err); 98251881Speter } 99251881Speter if (text_c || prop_c || tree_c) 100251881Speter *conflicts_remain = TRUE; 101251881Speter } 102251881Speter } 103251881Speter svn_pool_destroy(iterpool); 104251881Speter 105251881Speter return SVN_NO_ERROR; 106251881Speter} 107251881Speter 108251881Spetersvn_error_t * 109251881Spetersvn_client_resolve(const char *path, 110251881Speter svn_depth_t depth, 111251881Speter svn_wc_conflict_choice_t conflict_choice, 112251881Speter svn_client_ctx_t *ctx, 113251881Speter apr_pool_t *pool) 114251881Speter{ 115251881Speter const char *local_abspath; 116251881Speter svn_error_t *err; 117251881Speter const char *lock_abspath; 118251881Speter 119251881Speter if (svn_path_is_url(path)) 120251881Speter return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, 121251881Speter _("'%s' is not a local path"), path); 122251881Speter 123251881Speter SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool)); 124251881Speter 125251881Speter /* Similar to SVN_WC__CALL_WITH_WRITE_LOCK but using a custom 126251881Speter locking function. */ 127251881Speter 128251881Speter SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx, 129251881Speter local_abspath, pool, pool)); 130251881Speter err = svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath, 131251881Speter depth, 132251881Speter TRUE /* resolve_text */, 133251881Speter "" /* resolve_prop (ALL props) */, 134251881Speter TRUE /* resolve_tree */, 135251881Speter conflict_choice, 136251881Speter ctx->conflict_func2, 137251881Speter ctx->conflict_baton2, 138251881Speter ctx->cancel_func, ctx->cancel_baton, 139251881Speter ctx->notify_func2, ctx->notify_baton2, 140251881Speter pool); 141251881Speter 142251881Speter err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, 143251881Speter lock_abspath, 144251881Speter pool)); 145251881Speter svn_io_sleep_for_timestamps(path, pool); 146251881Speter 147251881Speter return svn_error_trace(err); 148251881Speter} 149