Searched refs:diff3_cmd (Results 1 - 14 of 14) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dswitch.c110 const char *diff3_cmd;
134 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
137 if (diff3_cmd != NULL)
138 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool));
317 diff3_cmd, preserved_exts,
108 const char *diff3_cmd; local
H A Dupdate.c319 const char *diff3_cmd;
439 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
442 if (diff3_cmd != NULL)
443 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool));
534 diff3_cmd, preserved_exts,
317 const char *diff3_cmd; local
H A Dexternals.c460 const char *diff3_cmd; local
473 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
476 if (diff3_cmd != NULL)
477 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool));
572 diff3_cmd, preserved_exts,
H A Dmerge.c314 /* The diff3_cmd in ctx->config, if any, else null. We could just member in struct:merge_cmd_baton_t
317 const char *diff3_cmd;
2151 merge_b->dry_run, merge_b->diff3_cmd,
9867 const char *diff3_cmd;
9923 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
9926 if (diff3_cmd != NULL)
9927 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool));
9948 merge_cmd_baton.diff3_cmd = diff3_cmd;
9858 const char *diff3_cmd; local
[all...]
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dmerge.c53 const char *diff3_cmd; /* The diff3 command and options */ member in struct:merge_target_t
444 const char *diff3_cmd,
459 result_f, diff3_cmd,
856 if (mt->diff3_cmd)
859 mt->diff3_cmd,
1092 const char *diff3_cmd,
1118 mt.diff3_cmd = diff3_cmd;
1134 (! is_binary) && diff3_cmd != NULL,
1218 const char *diff3_cmd,
441 do_text_merge_external(svn_boolean_t *contains_conflicts, apr_file_t *result_f, const char *diff3_cmd, const apr_array_header_t *merge_options, const char *detranslated_target, const char *left_abspath, const char *right_abspath, const char *target_label, const char *left_label, const char *right_label, apr_pool_t *scratch_pool) argument
1078 svn_wc__internal_merge(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, svn_wc__db_t *db, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *wri_abspath, const char *left_label, const char *right_label, const char *target_label, apr_hash_t *old_actual_props, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1205 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, enum svn_wc_notify_state_t *merge_props_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_hash_t *original_props, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
[all...]
H A Ddeprecated.c3602 const char *diff3_cmd,
3629 diff3_cmd,
3656 const char *diff3_cmd,
3686 if (diff3_cmd)
3687 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool));
3700 diff3_cmd,
3726 const char *diff3_cmd,
3738 diff3_cmd, NULL, editor, edit_baton,
3752 const char *diff3_cmd,
3588 svn_wc_get_update_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3640 svn_wc_get_update_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, svn_wc_get_file_t fetch_func, void *fetch_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3716 svn_wc_get_update_editor2(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3742 svn_wc_get_update_editor(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3775 svn_wc_get_switch_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t server_performs_filtering, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3824 svn_wc_get_switch_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3899 svn_wc_get_switch_editor2(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3928 svn_wc_get_switch_editor(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
4344 svn_wc_cleanup2(const char *path, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
4363 svn_wc_cleanup(const char *path, svn_wc_adm_access_t *optional_adm_access, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool) argument
4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_pool_t *pool) argument
4678 svn_wc_merge(const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, enum svn_wc_merge_outcome_t *merge_outcome, const char *diff3_cmd, apr_pool_t *pool) argument
[all...]
H A Dwc.h424 const char *diff3_cmd,
684 const char *diff3_cmd,
H A Dupdate_editor.c227 const char *diff3_cmd;
3869 const char *diff3_cmd,
3947 diff3_cmd, NULL, propchanges,
4107 eb->diff3_cmd,
4901 const char *diff3_cmd,
4973 eb->diff3_cmd = diff3_cmd;
5179 const char *diff3_cmd,
5204 diff3_cmd, preserved_exts, editor, edit_baton, argument
5222 const char *diff3_cmd,
224 const char *diff3_cmd; member in struct:edit_baton
3852 svn_wc__perform_file_merge(svn_skel_t **work_items, svn_skel_t **conflict_skel, svn_boolean_t *found_conflict, svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const svn_checksum_t *new_checksum, const svn_checksum_t *original_checksum, apr_hash_t *old_actual_props, const apr_array_header_t *ext_patterns, svn_revnum_t old_revision, svn_revnum_t target_revision, const apr_array_header_t *propchanges, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
4873 make_editor(svn_revnum_t *target_revision, svn_wc__db_t *db, const char *anchor_abspath, const char *target_basename, apr_hash_t *wcroot_iprops, svn_boolean_t use_commit_times, const char *switch_url, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
5160 svn_wc__get_update_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, apr_hash_t *wcroot_iprops, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dexternals.c1066 const char *diff3_cmd,
1107 eb->diff3cmd = diff3_cmd;
1053 svn_wc__get_file_external_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *local_abspath, const char *wri_abspath, const char *url, const char *repos_root_url, const char *repos_uuid, apr_array_header_t *iprops, svn_boolean_t use_commit_times, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const char *record_ancestor_abspath, const char *recorded_url, const svn_opt_revision_t *recorded_peg_rev, const svn_opt_revision_t *recorded_rev, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h5831 * If @a diff3_cmd is non-NULL, then use it as the diff3 command for
5900 const char *diff3_cmd,
5932 * This function assumes that @a diff3_cmd is path encoded. Later versions
5957 const char *diff3_cmd,
5986 const char *diff3_cmd,
6009 const char *diff3_cmd,
6046 const char *diff3_cmd,
6076 * This function assumes that @a diff3_cmd is path encoded. Later versions
6098 const char *diff3_cmd,
6127 const char *diff3_cmd,
[all...]
H A Dsvn_io.h2119 * @a diff3_cmd must be non-NULL.
2135 const char *diff3_cmd,
2139 /** Similar to svn_io_run_diff3_3(), but with @a diff3_cmd encoded in
2156 const char *diff3_cmd,
2175 const char *diff3_cmd,
/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h79 const char *diff3_cmd,
1446 * If @a diff3_cmd is non-NULL, then use it as the diff3 command for
1523 const char *diff3_cmd,
1565 const char *diff3_cmd,
/freebsd-11-stable/contrib/subversion/subversion/libsvn_subr/
H A Ddeprecated.c1144 const char *diff3_cmd,
1148 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool));
1154 diff3_cmd, user_args, pool));
1167 const char *diff3_cmd,
1173 merged, diff3_cmd, NULL, pool));
1133 svn_io_run_diff3_2(int *exitcode, const char *dir, const char *mine, const char *older, const char *yours, const char *mine_label, const char *older_label, const char *yours_label, apr_file_t *merged, const char *diff3_cmd, const apr_array_header_t *user_args, apr_pool_t *pool) argument
1156 svn_io_run_diff3(const char *dir, const char *mine, const char *older, const char *yours, const char *mine_label, const char *older_label, const char *yours_label, apr_file_t *merged, int *exitcode, const char *diff3_cmd, apr_pool_t *pool) argument
H A Dio.c3603 const char *diff3_cmd,
3626 args[i++] = diff3_cmd;
3693 SVN_ERR(svn_io_run_cmd(dir, diff3_cmd, args,
3707 svn_dirent_local_style(diff3_cmd, pool),
3585 svn_io_run_diff3_3(int *exitcode, const char *dir, const char *mine, const char *older, const char *yours, const char *mine_label, const char *older_label, const char *yours_label, apr_file_t *merged, const char *diff3_cmd, const apr_array_header_t *user_args, apr_pool_t *pool) argument

Completed in 417 milliseconds