Author: stylesen
Date: Fri May 28 06:38:31 2010
New Revision: 949113
URL: http://svn.apache.org/viewvc?rev=949113&view=rev
Log:
Introduce '--force-internal-diff' option for 'svn log' command.
* subversion/svn/main.c
(svn_cl__cmd_table): Add force internal diff option to svn log
command.
* subversion/svn/log-cmd.c
(svn_cl__log): Error if force internal diff option is used without
show diff option.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Adjust test output data for the newly added option.
Modified:
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=949113&r1=949112&r2=949113&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Fri May 28 06:38:31 2010
@@ -595,6 +595,10 @@ svn_cl__log(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'diff-cmd' option requires 'show-diff' "
"option"));
+ if (opt_state->force_internal_diff && (! opt_state->show_diff))
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("'force-internal-diff' option requires "
+ "'show-diff' option"));
if (opt_state->extensions && (! opt_state->show_diff))
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'extensions' option requires 'show-diff' "
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=949113&r1=949112&r2=949113&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri May 28 06:38:31 2010
@@ -687,7 +687,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" svn log http://www.example.com/repo/project foo.c bar.c\n"),
{'r', 'q', 'v', 'g', 'c', opt_targets, opt_stop_on_copy, opt_incremental,
opt_xml, 'l', opt_with_all_revprops, opt_with_no_revprops,
opt_with_revprop,
- opt_show_diff, opt_diff_cmd, 'x'},
+ opt_show_diff, opt_diff_cmd, opt_force_internal_diff, 'x'},
{{opt_with_revprop, N_("retrieve revision property ARG")},
{'c', N_("the change made in revision ARG")}} },
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=949113&r1=949112&r2=949113&view=diff
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Fri May 28 06:38:31 2010
@@ -56,6 +56,7 @@ Valid options:
--show-diff : produce diff output
[alias: --diff]
--diff-cmd ARG : use ARG as diff command
+ --force-internal-diff : override diff-cmd specified in config file
-x [--extensions] ARG : Default: '-u'. When Subversion is invoking an
external diff program, ARG is simply passed along
to the program. But when Subversion is using its
