r1764919 | ivan | 2016-10-14 09:36:39 -0500 (Fri, 14 Oct 2016) Improve C90 compatibility by removing trailing commas in enum lists as well as converting a variadic macro stub with an empty function. * subversion/include/svn_client.h * subversion/include/svn_wc.h * subversion/libsvn_subr/cache-membuffer.c * subversion/svn/svn.c * subversion/svnmucc/svnmucc.c (svn_client_config_option_id_t, svn_wc_notify_action_t, prefix_pool_create, svn_cl__longopt_t, sub_main): Remove trailing commas in enum lists. * tools/dev/svnmover/linenoise/linenouse.c (lndebug): Replace variadic macro stub with an empty variadic function. Patch by: Patrick Steinhardt <ps{_AT_}pks.im> (Log message tweaked by me.)
r1764883 | ivan | 2016-10-14 07:47:52 -0500 (Fri, 14 Oct 2016) 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, configure_option_local_move_file_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. Patch by: Patrick Steinhardt <ps{_AT_}pks.im>
r1764473 | stsp | 2016-10-12 09:18:01 -0500 (Wed, 12 Oct 2016) Remove variables which are written but not used in any way. * subversion/libsvn_client/conflicts.c: (conflict_tree_get_incoming_description_generic, conflict_tree_get_description_incoming_edit, resolve_incoming_move_dir_merge, configure_option_incoming_delete_accept, configure_option_incoming_move_file_merge, configure_option_incoming_dir_merge): Remove unused variables. Patch by: Patrick Steinhardt <patrick.steinhardt@elegosoft.com>