2 * resolved.c: wrapper around wc resolved functionality.
4 * ====================================================================
5 * Licensed to the Apache Software Foundation (ASF) under one
6 * or more contributor license agreements. See the NOTICE file
7 * distributed with this work for additional information
8 * regarding copyright ownership. The ASF licenses this file
9 * to you under the Apache License, Version 2.0 (the
10 * "License"); you may not use this file except in compliance
11 * with the License. You may obtain a copy of the License at
13 * http://www.apache.org/licenses/LICENSE-2.0
15 * Unless required by applicable law or agreed to in writing,
16 * software distributed under the License is distributed on an
17 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18 * KIND, either express or implied. See the License for the
19 * specific language governing permissions and limitations
21 * ====================================================================
24 /* ==================================================================== */
32 #include "svn_types.h"
34 #include "svn_client.h"
35 #include "svn_error.h"
36 #include "svn_dirent_uri.h"
38 #include "svn_pools.h"
40 #include "svn_sorts.h"
42 #include "private/svn_wc_private.h"
44 #include "svn_private_config.h"
49 svn_client__resolve_conflicts(svn_boolean_t *conflicts_remain,
50 apr_hash_t *conflicted_paths,
51 svn_client_ctx_t *ctx,
52 apr_pool_t *scratch_pool)
54 apr_pool_t *iterpool = svn_pool_create(scratch_pool);
55 apr_array_header_t *array;
59 *conflicts_remain = FALSE;
61 SVN_ERR(svn_hash_keys(&array, conflicted_paths, scratch_pool));
62 qsort(array->elts, array->nelts, array->elt_size,
63 svn_sort_compare_paths);
65 for (i = 0; i < array->nelts; i++)
67 const char *local_abspath = APR_ARRAY_IDX(array, i, const char *);
69 svn_pool_clear(iterpool);
70 SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath,
72 TRUE /* resolve_text */,
73 "" /* resolve_prop (ALL props) */,
74 TRUE /* resolve_tree */,
75 svn_wc_conflict_choose_unspecified,
78 ctx->cancel_func, ctx->cancel_baton,
79 ctx->notify_func2, ctx->notify_baton2,
85 svn_boolean_t text_c, prop_c, tree_c;
87 err = svn_wc_conflicted_p3(&text_c, &prop_c, &tree_c,
88 ctx->wc_ctx, local_abspath,
90 if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
93 text_c = prop_c = tree_c = FALSE;
99 if (text_c || prop_c || tree_c)
100 *conflicts_remain = TRUE;
103 svn_pool_destroy(iterpool);
109 svn_client_resolve(const char *path,
111 svn_wc_conflict_choice_t conflict_choice,
112 svn_client_ctx_t *ctx,
115 const char *local_abspath;
117 const char *lock_abspath;
119 if (svn_path_is_url(path))
120 return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
121 _("'%s' is not a local path"), path);
123 SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
125 /* Similar to SVN_WC__CALL_WITH_WRITE_LOCK but using a custom
128 SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,
129 local_abspath, pool, pool));
130 err = svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath,
132 TRUE /* resolve_text */,
133 "" /* resolve_prop (ALL props) */,
134 TRUE /* resolve_tree */,
137 ctx->conflict_baton2,
138 ctx->cancel_func, ctx->cancel_baton,
139 ctx->notify_func2, ctx->notify_baton2,
142 err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx,
145 svn_io_sleep_for_timestamps(path, pool);
147 return svn_error_trace(err);