Hi,
the third version re-adds the result pool to
`svn_client_conflict_option_get_lazel`.
[[
Move conflict resolution options' labels out of the client
* subversion/include/svn_client.h:
(svn_client_conflict_option_get_label): New function.
* subversion/libsvn_client/conflicts.c:
(svn_client_conflict_option_t): Add label.
(add_resolution_option): Add label argument.
(svn_client_conflict_option_get_label): New function.
(svn_client_conflict_text_get_reslution_options,
svn_client_conflict_prop_get_resolution_options,
configure_option_accept_current_wc_state,
configure_option_move_destination,
configure_option_update_raise_moved_away_children,
configure_option_incoming_add_ignore,
configure_option_incoming_added_file_text_merge,
configure_option_incoming_added_file_replace_and_merge,
configure_option_incoming_added_dir_merge,
configure_option_incoming_added_dir_replace,
configure_option_incoming_added_dir_replace_and_merge,
configure_option_incoming_delete_ignore,
configure_option_incoming_delete_accept,
configure_option_incoming_move_file_merge,
configure_option_incoming_dir_merge,
svn_client_conflict_tree_get_resolution_options): Set
resolution option labels.
* subversion/svn/conflict-callbacks.c:
(resolver_option_t): Remove short_desc and long_desc.
(client_option_t): New struct for client options.
(builtin_resolver_options): Remove short_desc and long_desc.
(extra_resolver_options,
extra_resolver_options_text,
extra_resolver_options_prop,
extra_resolver_options_tree): Convert to client_option_t.
(find_option): Accept options as apr_array_header_t.
(find_option_by_builtin): New function to create provided
options from builtin library options.
(find_option_by_id): Replaced by find_option_by_builtin.
(prompt_string,
help_string,
prompt_user,
build_text_conflict_options,
build_prop_conflict_options,
build_prop_text_conflict_options,
handle_one_prop_conflict.
build_tree_conflict_options,
handle_tree_conflict): Accept options as apr_array_header_t.
]]
Regards
Patick
Received on 2016-10-13 17:26:18 CEST