Author: stsp
Date: Wed Dec 19 21:39:16 2012
New Revision: 1424151
URL: http://svn.apache.org/viewvc?rev=1424151&view=rev
Log:
Clarify the new default behaviour of the --non-interactive option.
* subversion/svn/svn.c
(svn_cl__options): When describing the --non-interactive option, mention
that it is now toggled based on whether standard input is a terminal device.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Adjust accordingly.
Modified:
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1424151&r1=1424150&r2=1424151&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Dec 19 21:39:16 2012
@@ -230,11 +230,13 @@ const apr_getopt_option_t svn_cl__option
" "
"with '--non-interactive')") },
{"non-interactive", opt_non_interactive, 0,
- N_("do no interactive prompting")},
+ N_("do no interactive prompting (default is to prompt\n"
+ " "
+ "only if standard input is a terminal device)")},
{"force-interactive", opt_force_interactive, 0,
- N_("do interactive prompting even if standard input\n"
- " "
- "is not a terminal device")},
+ N_("do interactive prompting even if standard input\n"
+ " "
+ "is not a terminal device")},
{"dry-run", opt_dry_run, 0,
N_("try operation but make no changes")},
{"ignore-ancestry", opt_ignore_ancestry, 0,
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=1424151&r1=1424150&r2=1424151&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
Wed Dec 19 21:39:16 2012
@@ -116,7 +116,8 @@ Global options:
--username ARG : specify a username ARG
--password ARG : specify a password ARG
--no-auth-cache : do not cache authentication tokens
- --non-interactive : do no interactive prompting
+ --non-interactive : do no interactive prompting (default is to prompt
+ only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : accept SSL server certificates from unknown
@@ -198,7 +199,8 @@ Global options:
--username ARG : specify a username ARG
--password ARG : specify a password ARG
--no-auth-cache : do not cache authentication tokens
- --non-interactive : do no interactive prompting
+ --non-interactive : do no interactive prompting (default is to prompt
+ only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : accept SSL server certificates from unknown
