Re: Diff Project --invoke-diff-cmd part
From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Mon, 13 May 2013 22:53:14 +0100
Hi,
thanks for all the comments and help, here is the next attempt.
Gabriela
[[[
* subversion/include/svn_client.h
(svn_client_diff7, svn_client_diff_peg7): Declare the new API. Like
(svn_client_diff6, svn_client_diff_peg_6): Deprecate.
* subversion/include/svn_config.h
(SVN_CONFIG_OPTION_INVOKE_DIFF_CMD): New definition.
* subversion/include/svn_io.h
(svn_io_create_custom_diff_cmd): New function.
(svn_io_run_external_diff): New function.
* subversion/libsvn_client/deprecated.c
(svn_client_diff6, svn_client_diff_peg6): New deprecation wrappers.
* subversion/libsvn_client/diff.c
(struct diff_cmd_baton): New member: 'invoke_diff_cmd'.
(diff_content_changed): Call svn_io_run_external_diff if
(set_up_diff_cmd_and_options): Apply invoke-diff-cmd option
(svn_client_diff_peg_7): Rename and update from
(svn_client_diff7): Rename and update from svn_client_diff6, add
(): Update all comments mentioning 'svn_client_diff6' to
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): New entry: invoke-diff-cmd.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): New function.
(svn_io_run_external_diff): New function.
* subversion/svn/cl.h
(struct svn_cl__opt_state_t.diff): New member: 'invoke_diff_cmd'.
* subversion/svn/diff-cmd.c
(svn_cl__diff): Update call to svn_client_diff6 to svn_client_diff7.
* subversion/svn/svn.c
(svn_cl__options[]): Add help info and new variable:
(svn_cl__cmd_table[]): New option: 'invoke-diff-cmd'.
(sub_main): Prohibit simultaneous usage of --invoke-diff-cmd and
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): New function.
(test_list): Add new entry 'diff_invoke_external_diffcmd'.
* tools/hook-scripts/argv_dump.pl
(New File): Perl script that enumerates output by svn to assist with
]]]
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.