Author: danielsh
Date: Mon Oct 25 20:00:56 2010
New Revision: 1027249
URL: http://svn.apache.org/viewvc?rev=1027249&view=rev
Log:
Follow-up to r1027245. (It was already sitting in my wc when that
revision was committed.)
* subversion/svn/cl.h
(svn_cl__opt_state_t.show_diff): Note option name in comment.
* subversion/svn/log-cmd.c
(log_receiver_baton): Ditto.
* subversion/svn/main.c
(opt_diff): Renamed from 'opt_show_diff'.
(svn_cl__options, svn_cl__cmd_table, main): Track rename.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1027249&r1=1027248&r2=1027249&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Mon Oct 25 20:00:56 2010
@@ -226,7 +226,7 @@ typedef struct svn_cl__opt_state_t
svn_boolean_t reverse_diff; /* reverse a diff (e.g. when patching) */
svn_boolean_t ignore_whitespace; /* don't account for whitespace when
patching */
- svn_boolean_t show_diff; /* produce diff output */
+ svn_boolean_t show_diff; /* produce diff output (maps to --diff) */
svn_boolean_t internal_diff; /* override diff_cmd in config file */
svn_boolean_t use_git_diff_format; /* Use git's extended diff format */
} svn_cl__opt_state_t;
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1027249&r1=1027248&r2=1027249&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Mon Oct 25 20:00:56 2010
@@ -57,7 +57,7 @@ struct log_receiver_baton
/* Don't print log message body nor its line count. */
svn_boolean_t omit_log_message;
- /* Whether to show diffs in the log. */
+ /* Whether to show diffs in the log. (maps to --diff) */
svn_boolean_t show_diff;
/* Diff arguments received from command line. */
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1027249&r1=1027248&r2=1027249&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 20:00:56 2010
@@ -119,7 +119,7 @@ typedef enum {
opt_ignore_keywords,
opt_reverse_diff,
opt_ignore_whitespace,
- opt_show_diff,
+ opt_diff,
opt_internal_diff,
opt_use_git_diff_format,
} svn_cl__longopt_t;
@@ -327,8 +327,7 @@ const apr_getopt_option_t svn_cl__option
N_("apply the unidiff in reverse")},
{"ignore-whitespace", opt_ignore_whitespace, 0,
N_("ignore whitespace during pattern matching")},
- {"diff", opt_show_diff, 0,
- N_("produce diff output")},
+ {"diff", opt_diff, 0, N_("produce diff output")}, /* maps to show_diff */
{"internal-diff", opt_internal_diff, 0,
N_("override diff-cmd specified in config file")},
{"git", opt_use_git_diff_format, 0,
@@ -662,7 +661,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" svn log http://www.example.com/repo/proj...@50 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, opt_internal_diff, 'x'},
+ opt_diff, opt_diff_cmd, opt_internal_diff, 'x'},
{{opt_with_revprop, N_("retrieve revision property ARG")},
{'c', N_("the change made in revision ARG")}} },
@@ -1778,7 +1777,7 @@ main(int argc, const char *argv[])
case opt_ignore_whitespace:
opt_state.ignore_whitespace = TRUE;
break;
- case opt_show_diff:
+ case opt_diff:
opt_state.show_diff = TRUE;
break;
case opt_internal_diff:
