File Manager

003 File Manager

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

usr / src / contrib / subversion / subversion / libsvn_client /

📁 ..
📄 add.c(43.54 KB)
📄 blame.c(32.45 KB)
📄 cat.c(12.07 KB)
📄 changelist.c(4.8 KB)
📄 checkout.c(8.3 KB)
📄 cleanup.c(8.64 KB)
📄 client.h(52.12 KB)
📄 cmdline.c(14.22 KB)
📄 commit.c(38.22 KB)
📄 commit_util.c(77.37 KB)
📄 compat_providers.c(4.31 KB)
📄 conflicts.c(550.68 KB)
📄 copy.c(136.7 KB)
📄 ctx.c(4.06 KB)
📄 delete.c(22.09 KB)
📄 deprecated.c(115.45 KB)
📄 diff.c(113.72 KB)
📄 diff_local.c(27.35 KB)
📄 diff_summarize.c(9.92 KB)
📄 export.c(55.73 KB)
📄 externals.c(50.42 KB)
📄 import.c(37.83 KB)
📄 info.c(17.37 KB)
📄 iprops.c(9.06 KB)
📄 layout.c(9.34 KB)
📄 libsvn_client.pc.in(357 B)
📄 list.c(20.66 KB)
📄 locking_commands.c(22.19 KB)
📄 log.c(34.9 KB)
📄 merge.c(525.07 KB)
📄 merge_elements.c(8.1 KB)
📄 mergeinfo.c(91.66 KB)
📄 mergeinfo.h(19.55 KB)
📄 mtcc.c(46.92 KB)
📄 patch.c(134.18 KB)
📄 prop_commands.c(57.71 KB)
📄 ra.c(42.82 KB)
📄 relocate.c(8.09 KB)
📄 repos_diff.c(45.37 KB)
📄 resolved.c(5.24 KB)
📄 revert.c(6.38 KB)
📄 revisions.c(7.65 KB)
📄 shelf.c(43.11 KB)
📄 shelf2.c(73.33 KB)
📄 status.c(29.84 KB)
📄 switch.c(18.86 KB)
📄 update.c(30.38 KB)
📄 upgrade.c(15.42 KB)
📄 url.c(1.98 KB)
📄 util.c(15.01 KB)
📄 version.c(1.13 KB)
📄 wc_editor.c(20.4 KB)

Editing: resolved.c

/*
 * resolved.c:  wrapper around Subversion <=1.9 wc resolved functionality
 *
 * ====================================================================
 *    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_types.h"
#include "svn_wc.h"
#include "svn_client.h"
#include "svn_error.h"
#include "svn_dirent_uri.h"
#include "svn_path.h"
#include "svn_pools.h"
#include "svn_hash.h"
#include "svn_sorts.h"
#include "client.h"
#include "private/svn_sorts_private.h"
#include "private/svn_wc_private.h"

#include "svn_private_config.h"

/*** Code. ***/

svn_error_t *
svn_client__resolve_conflicts(svn_boolean_t *conflicts_remain,
                              apr_hash_t *conflicted_paths,
                              svn_client_ctx_t *ctx,
                              apr_pool_t *scratch_pool)
{
  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
  apr_array_header_t *array;
  int i;

if (conflicts_remain)
    *conflicts_remain = FALSE;

SVN_ERR(svn_hash_keys(&array, conflicted_paths, scratch_pool));
  svn_sort__array(array, svn_sort_compare_paths);

for (i = 0; i < array->nelts; i++)
    {
      const char *local_abspath = APR_ARRAY_IDX(array, i, const char *);

svn_pool_clear(iterpool);
      SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath,
                                        svn_depth_empty,
                                        TRUE /* resolve_text */,
                                        "" /* resolve_prop (ALL props) */,
                                        TRUE /* resolve_tree */,
                                        svn_wc_conflict_choose_unspecified,
                                        ctx->conflict_func2,
                                        ctx->conflict_baton2,
                                        ctx->cancel_func, ctx->cancel_baton,
                                        ctx->notify_func2, ctx->notify_baton2,
                                        iterpool));

if (conflicts_remain && !*conflicts_remain)
        {
          svn_error_t *err;
          svn_boolean_t text_c, prop_c, tree_c;

err = svn_wc_conflicted_p3(&text_c, &prop_c, &tree_c,
                                     ctx->wc_ctx, local_abspath,
                                     iterpool);
          if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
            {
              svn_error_clear(err);
              text_c = prop_c = tree_c = FALSE;
            }
          else
            {
              SVN_ERR(err);
            }
          if (text_c || prop_c || tree_c)
            *conflicts_remain = TRUE;
        }
    }
  svn_pool_destroy(iterpool);

return SVN_NO_ERROR;
}

svn_error_t *
svn_client_resolve(const char *path,
                   svn_depth_t depth,
                   svn_wc_conflict_choice_t conflict_choice,
                   svn_client_ctx_t *ctx,
                   apr_pool_t *pool)
{
  const char *local_abspath;
  svn_error_t *err;
  const char *lock_abspath;

if (svn_path_is_url(path))
    return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
                             _("'%s' is not a local path"), path);

SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));

/* Similar to SVN_WC__CALL_WITH_WRITE_LOCK but using a custom
     locking function. */

SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,
                                                 local_abspath, pool, pool));
  err = svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath,
                                  depth,
                                  TRUE /* resolve_text */,
                                  "" /* resolve_prop (ALL props) */,
                                  TRUE /* resolve_tree */,
                                  conflict_choice,
                                  ctx->conflict_func2,
                                  ctx->conflict_baton2,
                                  ctx->cancel_func, ctx->cancel_baton,
                                  ctx->notify_func2, ctx->notify_baton2,
                                  pool);

err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx,
                                                                 lock_abspath,
                                                                 pool));
  svn_io_sleep_for_timestamps(path, pool);

return svn_error_trace(err);
}

003 File Manager

Editing: resolved.c

Upload File

Create Folder