1251881Speter/* 2251881Speter * resolved-cmd.c -- Subversion resolved subcommand 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#include "svn_path.h" 30251881Speter#include "svn_client.h" 31251881Speter#include "svn_error.h" 32251881Speter#include "svn_pools.h" 33251881Speter#include "cl.h" 34251881Speter 35251881Speter#include "svn_private_config.h" 36251881Speter 37251881Speter 38251881Speter 39251881Speter/*** Code. ***/ 40251881Speter 41251881Speter/* This implements the `svn_opt_subcommand_t' interface. */ 42251881Spetersvn_error_t * 43251881Spetersvn_cl__resolved(apr_getopt_t *os, 44251881Speter void *baton, 45251881Speter apr_pool_t *scratch_pool) 46251881Speter{ 47251881Speter svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; 48251881Speter svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; 49251881Speter svn_error_t *err; 50251881Speter apr_array_header_t *targets; 51251881Speter apr_pool_t *iterpool; 52251881Speter int i; 53251881Speter 54251881Speter SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, 55251881Speter opt_state->targets, 56251881Speter ctx, FALSE, 57251881Speter scratch_pool)); 58251881Speter if (! targets->nelts) 59251881Speter return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL); 60251881Speter 61251881Speter if (opt_state->depth == svn_depth_unknown) 62251881Speter opt_state->depth = svn_depth_empty; 63251881Speter 64251881Speter SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool)); 65251881Speter 66251881Speter SVN_ERR(svn_cl__check_targets_are_local_paths(targets)); 67251881Speter 68251881Speter iterpool = svn_pool_create(scratch_pool); 69251881Speter for (i = 0; i < targets->nelts; i++) 70251881Speter { 71251881Speter const char *target = APR_ARRAY_IDX(targets, i, const char *); 72251881Speter svn_pool_clear(iterpool); 73251881Speter SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton)); 74251881Speter err = svn_client_resolve(target, 75251881Speter opt_state->depth, 76251881Speter svn_wc_conflict_choose_merged, 77251881Speter ctx, 78251881Speter iterpool); 79251881Speter if (err) 80251881Speter { 81251881Speter svn_handle_warning2(stderr, err, "svn: "); 82251881Speter svn_error_clear(err); 83251881Speter } 84251881Speter } 85251881Speter svn_pool_destroy(iterpool); 86251881Speter 87251881Speter return SVN_NO_ERROR; 88251881Speter} 89