Author: svn-role
Date: Mon Apr 15 17:10:18 2013
New Revision: 1468145
URL: http://svn.apache.org/r1468145
Log:
Merge r1467587 from trunk:
* r1467587
Fix issue #3913, "svnrdump load" is not working in interactive mode
Justification:
Fixes a UI quirk requiring users to remember typing --force-interactive
for auth creds prompting to work, in a situation where we should
be prompting for creds by default IMHO.
Votes:
+1: stsp, rhuijben, pburba
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svnrdump/svnrdump.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1467587
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1468145&r1=1468144&r2=1468145&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Apr 15 17:10:18 2013
@@ -40,15 +40,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1467587
- Fix issue #3913, "svnrdump load" is not working in interactive mode
- Justification:
- Fixes a UI quirk requiring users to remember typing --force-interactive
- for auth creds prompting to work, in a situation where we should
- be prompting for creds by default IMHO.
- Votes:
- +1: stsp, rhuijben, pburba
-
* r1467668
Update INSTALL about in-tree dependencies (from get-deps.sh)
Justification:
Modified: subversion/branches/1.8.x/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnrdump/svnrdump.c?rev=1468145&r1=1468144&r2=1468145&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/1.8.x/subversion/svnrdump/svnrdump.c Mon Apr 15
17:10:18 2013
@@ -994,9 +994,6 @@ main(int argc, const char **argv)
"are mutually exclusive"));
return svn_cmdline_handle_exit_error(err, pool, "svnrdump: ");
}
- else
- non_interactive = !svn_cmdline__be_interactive(non_interactive,
- force_interactive);
if (opt_baton->help)
{
@@ -1128,6 +1125,22 @@ main(int argc, const char **argv)
opt_baton->url = svn_uri_canonicalize(repos_url, pool);
}
+ if (strcmp(subcommand->name, "load") == 0)
+ {
+ /*
+ * By default (no --*-interactive options given), the 'load' subcommand
+ * is interactive unless username and password were provided on the
+ * command line. This allows prompting for auth creds to work without
+ * requiring users to remember to use --force-interactive.
+ * See issue #3913, "svnrdump load is not working in interactive mode".
+ */
+ if (!non_interactive && !force_interactive)
+ force_interactive = (username == NULL || password == NULL);
+ }
+
+ non_interactive = !svn_cmdline__be_interactive(non_interactive,
+ force_interactive);
+
SVNRDUMP_ERR(init_client_context(&(opt_baton->ctx),
non_interactive,
username,
