Author: stsp
Date: Mon Oct 25 20:09:55 2010
New Revision: 1027252
URL: http://svn.apache.org/viewvc?rev=1027252&view=rev
Log:
* subversion/svn/cl.h
(svn_cl__opt_state_t): Rename 'strip_count' field to 'strip' so it matches
the corresponding option name.
* subversion/svn/patch-cmd.c
(svn_cl__patch): Track rename.
* subversion/svn/main.c
(svn_cl__longopt_t): Rename 'opt_strip_count' to 'opt_strip'.
(svn_cl_options, svn_cl__cmd_table, main): Track renames.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/svn/patch-cmd.c
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1027252&r1=1027251&r2=1027252&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Mon Oct 25 20:09:55 2010
@@ -221,7 +221,7 @@ typedef struct svn_cl__opt_state_t
svn_boolean_t reintegrate; /* use "reintegrate" merge-source heuristic */
svn_boolean_t trust_server_cert; /* trust server SSL certs that would
otherwise be rejected as "untrusted" */
- int strip_count; /* number of leading path components to strip */
+ int strip; /* number of leading path components to strip */
svn_boolean_t ignore_keywords; /* do not expand keywords */
svn_boolean_t reverse_diff; /* reverse a diff (e.g. when patching) */
svn_boolean_t ignore_whitespace; /* don't account for whitespace when
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1027252&r1=1027251&r2=1027252&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 20:09:55 2010
@@ -114,7 +114,7 @@ typedef enum {
opt_show_revs,
opt_reintegrate,
opt_trust_server_cert,
- opt_strip_count,
+ opt_strip,
opt_show_copies_as_adds,
opt_ignore_keywords,
opt_reverse_diff,
@@ -303,7 +303,7 @@ const apr_getopt_option_t svn_cl__option
"('merged', 'eligible')")},
{"reintegrate", opt_reintegrate, 0,
N_("lump-merge all of source URL's unmerged changes")},
- {"strip", opt_strip_count, 1,
+ {"strip", opt_strip, 1,
N_("number of leading path components to strip from\n"
SVN_CL__OPTION_CONTINUATION_INDENT
"paths parsed from the patch file. --strip 0\n"
@@ -808,7 +808,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" for addition. Use 'svn revert' to undo deletions and additions you\n"
" do not agree with.\n"
),
- {'q', opt_dry_run, opt_strip_count, opt_reverse_diff,
+ {'q', opt_dry_run, opt_strip, opt_reverse_diff,
opt_ignore_whitespace} },
{ "propdel", svn_cl__propdel, {"pdel", "pd"}, N_
@@ -1748,22 +1748,22 @@ main(int argc, const char *argv[])
case opt_reintegrate:
opt_state.reintegrate = TRUE;
break;
- case opt_strip_count:
+ case opt_strip:
{
char *end;
- opt_state.strip_count = (int) strtol(opt_arg, &end, 10);
+ opt_state.strip = (int) strtol(opt_arg, &end, 10);
if (end == opt_arg || *end != '\0')
{
err = svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("Invalid strip count '%s'"), opt_arg);
return svn_cmdline_handle_exit_error(err, pool, "svn: ");
}
- if (opt_state.strip_count < 0)
+ if (opt_state.strip < 0)
{
err = svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
_("Negative strip count '%i' "
"(strip count must be positive)"),
- opt_state.strip_count);
+ opt_state.strip);
return svn_cmdline_handle_exit_error(err, pool, "svn: ");
}
}
Modified: subversion/trunk/subversion/svn/patch-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/patch-cmd.c?rev=1027252&r1=1027251&r2=1027252&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/patch-cmd.c (original)
+++ subversion/trunk/subversion/svn/patch-cmd.c Mon Oct 25 20:09:55 2010
@@ -73,7 +73,7 @@ svn_cl__patch(apr_getopt_t *os,
pool));
SVN_ERR(svn_client_patch(abs_patch_path, abs_target_path,
- opt_state->dry_run, opt_state->strip_count,
+ opt_state->dry_run, opt_state->strip,
opt_state->reverse_diff,
opt_state->ignore_whitespace,
TRUE, NULL, NULL, ctx, pool, pool));
