File Manager

003 File Manager

Current Path: /usr/src/contrib/subversion/subversion/svn

usr / src / contrib / subversion / subversion / svn /

📁 ..
📄 add-cmd.c(3.78 KB)
📄 auth-cmd.c(16.46 KB)
📄 blame-cmd.c(14.58 KB)
📄 cat-cmd.c(4.29 KB)
📄 changelist-cmd.c(4.57 KB)
📄 checkout-cmd.c(5.82 KB)
📄 cl-conflicts.c(21.93 KB)
📄 cl-conflicts.h(2.5 KB)
📄 cl-log.h(3.39 KB)
📄 cl.h(40.44 KB)
📄 cleanup-cmd.c(5.4 KB)
📄 commit-cmd.c(6.63 KB)
📄 conflict-callbacks.c(87.42 KB)
📄 copy-cmd.c(6.39 KB)
📄 delete-cmd.c(3.14 KB)
📄 deprecated.c(1.79 KB)
📄 diff-cmd.c(22.11 KB)
📄 export-cmd.c(4.75 KB)
📄 file-merge.c(32.47 KB)
📄 filesize.c(7.68 KB)
📄 help-cmd.c(7.5 KB)
📄 import-cmd.c(4.59 KB)
📄 info-cmd.c(47.29 KB)
📄 list-cmd.c(18.28 KB)
📄 lock-cmd.c(4.52 KB)
📄 log-cmd.c(31.42 KB)
📄 merge-cmd.c(22.37 KB)
📄 mergeinfo-cmd.c(16.47 KB)
📄 mkdir-cmd.c(3.5 KB)
📄 move-cmd.c(3.56 KB)
📄 notify.c(47.35 KB)
📄 patch-cmd.c(3.13 KB)
📄 propdel-cmd.c(3.66 KB)
📄 propedit-cmd.c(13.35 KB)
📄 propget-cmd.c(18.53 KB)
📄 proplist-cmd.c(11.44 KB)
📄 props.c(10.02 KB)
📄 propset-cmd.c(6.99 KB)
📄 relocate-cmd.c(4.19 KB)
📄 resolve-cmd.c(7.12 KB)
📄 resolved-cmd.c(2.9 KB)
📄 revert-cmd.c(2.99 KB)
📁 schema
📄 shelf-cmd.c(48.59 KB)
📄 shelf-cmd.h(1.47 KB)
📄 shelf2-cmd.c(47.33 KB)
📄 shelf2-cmd.h(1.48 KB)
📄 similarity.c(4.03 KB)
📄 status-cmd.c(15.72 KB)
📄 status.c(22.04 KB)
📄 svn.1(1.9 KB)
📄 svn.c(149.85 KB)
📄 switch-cmd.c(7.39 KB)
📄 unlock-cmd.c(3.28 KB)
📄 update-cmd.c(7.39 KB)
📄 upgrade-cmd.c(2.54 KB)
📄 util.c(39.66 KB)

Editing: resolve-cmd.c

/*
 * resolve-cmd.c -- Subversion resolve subcommand
 *
 * ====================================================================
 *    Licensed to the Apache Software Foundation (ASF) under one
 *    or more contributor license agreements.  See the NOTICE file
 *    distributed with this work for additional information
 *    regarding copyright ownership.  The ASF licenses this file
 *    to you under the Apache License, Version 2.0 (the
 *    "License"); you may not use this file except in compliance
 *    with the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing,
 *    software distributed under the License is distributed on an
 *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 *    KIND, either express or implied.  See the License for the
 *    specific language governing permissions and limitations
 *    under the License.
 * ====================================================================
 */

/* ==================================================================== */

/*** Includes. ***/
#include "svn_path.h"
#include "svn_client.h"
#include "svn_error.h"
#include "svn_pools.h"
#include "svn_hash.h"
#include "cl.h"

#include "svn_private_config.h"

/*** Code. ***/

struct conflict_walker_baton
{
  svn_client_ctx_t *ctx;
  svn_cl__accept_t accept_which;
  svn_boolean_t quit;
  svn_boolean_t external_failed;
  svn_boolean_t printed_summary;
  const char *editor_cmd;
  const char *path_prefix;
  svn_cmdline_prompt_baton_t *pb;
  svn_cl__conflict_stats_t *conflict_stats;
};

/* Implements svn_client_conflict_walk_func_t. */
static svn_error_t *
conflict_walker(void *baton, svn_client_conflict_t *conflict,
                apr_pool_t *scratch_pool)
{
  struct conflict_walker_baton *cwb = baton;

SVN_ERR(svn_cl__resolve_conflict(&cwb->quit, &cwb->external_failed,
                                   &cwb->printed_summary, conflict,
                                   cwb->accept_which, cwb->editor_cmd,
                                   cwb->path_prefix, cwb->pb,
                                   cwb->conflict_stats,
                                   cwb->ctx, scratch_pool));
  if (cwb->quit)
    return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);

return SVN_NO_ERROR;
}

svn_error_t *
svn_cl__walk_conflicts(apr_array_header_t *targets,
                       svn_cl__conflict_stats_t *conflict_stats,
                       svn_cl__opt_state_t *opt_state,
                       svn_client_ctx_t *ctx,
                       apr_pool_t *scratch_pool)
{
  svn_boolean_t had_error = FALSE;
  svn_cmdline_prompt_baton_t *pb = apr_palloc(scratch_pool, sizeof(*pb));
  struct conflict_walker_baton cwb = { 0 };
  const char *path_prefix;
  svn_error_t *err;
  int i;
  apr_pool_t *iterpool;

SVN_ERR(svn_dirent_get_absolute(&path_prefix, "", scratch_pool));

pb->cancel_func = ctx->cancel_func;
  pb->cancel_baton = ctx->cancel_baton;

cwb.ctx = ctx;
  cwb.accept_which = opt_state->accept_which;
  cwb.quit = FALSE;
  cwb.external_failed = FALSE;
  cwb.printed_summary = FALSE;
  cwb.editor_cmd = opt_state->editor_cmd;
  cwb.path_prefix = path_prefix;
  cwb.pb = pb;
  cwb.conflict_stats = conflict_stats;

iterpool = svn_pool_create(scratch_pool);
  for (i = 0; i < targets->nelts; i++)
    {
      const char *target = APR_ARRAY_IDX(targets, i, const char *);
      const char *local_abspath;
      svn_client_conflict_t *conflict;

svn_pool_clear(iterpool);

SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));

SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool));

if (opt_state->depth == svn_depth_empty)
        {
          SVN_ERR(svn_client_conflict_get(&conflict, local_abspath, ctx,
                                          iterpool, iterpool));
          err = svn_cl__resolve_conflict(&cwb.quit, &cwb.external_failed,
                                         &cwb.printed_summary,
                                         conflict, opt_state->accept_which,
                                         opt_state->editor_cmd,
                                         path_prefix, pb, conflict_stats,
                                         ctx, iterpool);
        }
      else
        err = svn_client_conflict_walk(local_abspath, opt_state->depth,
                                       conflict_walker, &cwb, ctx, iterpool);

if (err)
        {
          svn_error_t *root = svn_error_root_cause(err);

if (root->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
            {
              /* ### Ignore. These errors can happen due to the working copy
               * ### being re-arranged during tree conflict resolution. */
              svn_error_clear(err);
              continue;
            }
          else if (root->apr_err == SVN_ERR_CANCELLED)
            {
              svn_error_clear(err);
              break;
            }

svn_handle_warning2(stderr, svn_error_root_cause(err), "svn: ");
          svn_error_clear(err);
          had_error = TRUE;
        }
    }
  svn_pool_destroy(iterpool);

if (had_error)
    return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                            _("Failure occurred resolving one or more "
                              "conflicts"));
  return SVN_NO_ERROR;
}

/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__resolve(apr_getopt_t *os,
                void *baton,
                apr_pool_t *scratch_pool)
{
  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
  svn_cl__conflict_stats_t *conflict_stats =
    ((svn_cl__cmd_baton_t *) baton)->conflict_stats;
  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
  apr_array_header_t *targets;

SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
                                                      opt_state->targets,
                                                      ctx, FALSE,
                                                      scratch_pool));
  if (! targets->nelts)
    svn_opt_push_implicit_dot_target(targets, scratch_pool);

if (opt_state->depth == svn_depth_unknown)
    {
      if (opt_state->accept_which == svn_cl__accept_unspecified)
        opt_state->depth = svn_depth_infinity;
      else
        opt_state->depth = svn_depth_empty;
    }

SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));

SVN_ERR(svn_cl__check_targets_are_local_paths(targets));

if (opt_state->accept_which == svn_cl__accept_unspecified &&
      opt_state->non_interactive)
    {
      return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                              _("missing --accept option"));
    }
  else if (opt_state->accept_which == svn_cl__accept_postpone ||
           opt_state->accept_which == svn_cl__accept_edit ||
           opt_state->accept_which == svn_cl__accept_launch)
    {
      return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                              _("invalid 'accept' ARG"));
    }

SVN_ERR(svn_cl__walk_conflicts(targets, conflict_stats,
                                 opt_state, ctx, scratch_pool));

return SVN_NO_ERROR;
}

003 File Manager

Editing: resolve-cmd.c

Upload File

Create Folder