You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/12/05 01:41:54 UTC
svn commit: r1643143 - in
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer:
help-cmd.c svn-mergeinfo-normalizer.c
Author: stefan2
Date: Fri Dec 5 00:41:54 2014
New Revision: 1643143
URL: http://svn.apache.org/viewvc?rev=1643143&view=rev
Log:
Fix 'help' command for the svn-mergeinfo-normalizer tool.
* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(sub_main): Make 'help <subcommand>' work by keeping the target list
untouched for the 'help' command.
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): Update general help string to name the correct tool.
Found by: philip
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c?rev=1643143&r1=1643142&r2=1643143&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c Fri Dec 5 00:41:54 2014
@@ -51,10 +51,11 @@ svn_min__help(apr_getopt_t *os,
char help_header[] =
N_("usage: svn <subcommand> [options] [args]\n"
- "Subversion command-line client.\n"
- "Type 'svn help <subcommand>' for help on a specific subcommand.\n"
- "Type 'svn --version' to see the program version and RA modules\n"
- " or 'svn --version --quiet' to see just the version number.\n"
+ "Subversion svn:mergeinfo normalization and reduction tool.\n"
+ "Type 'svn-mergeinfo-normalizer help <subcommand>' for help on a specific\n"
+ "subcommand. Type 'svn-mergeinfo-normalizer --version' to see the program\n"
+ "version and RA modules or 'svn-mergeinfo-normalizer --version --quiet'\n"
+ "to see just the version number.\n"
"\n"
"Most subcommands take file and/or directory arguments, recursing\n"
"on the directories. If no arguments are supplied to such a\n"
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1643143&r1=1643142&r2=1643143&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c Fri Dec 5 00:41:54 2014
@@ -722,12 +722,17 @@ sub_main(int *exit_code, int argc, const
SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS,
TRUE));
- SVN_ERR(svn_client_args_to_target_array2(&opt_state.targets,
- os, opt_state.targets,
- ctx, FALSE, pool));
+ /* Get targets from command line - unless we are running "help".
+ * The help sub-command will do its own parsing. */
+ if (strcmp(subcommand->name, "help"))
+ {
+ SVN_ERR(svn_client_args_to_target_array2(&opt_state.targets,
+ os, opt_state.targets,
+ ctx, FALSE, pool));
- /* Add "." if user passed 0 arguments. */
- svn_opt_push_implicit_dot_target(opt_state.targets, pool);
+ /* Add "." if user passed 0 arguments. */
+ svn_opt_push_implicit_dot_target(opt_state.targets, pool);
+ }
/* And now we finally run the subcommand. */
err = (*subcommand->cmd_func)(os, &command_baton, pool);