git-svn reads usernames and other user queries from an interactive terminal. This cause GUIs (w/o STDIN connected) to hang waiting forever for git-svn to complete (http://code.google.com/p/tortoisegit/issues/detail?id=967). This change extends the Git->prompt method, so that it can also be used for non password queries, and makes use of it instead of using hand-rolled prompt-response code that only works with the interactive terminal. Signed-off-by: Sven Strickroth <email@xxxxxxxxxx> --- git-svn.perl | 16 +++++----------- perl/Git.pm | 25 +++++++++++++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index bcee8aa..1f30dc2 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -4357,11 +4357,10 @@ sub ssl_server_trust { issuer_dname fingerprint); my $choice; prompt: - print STDERR $may_save ? + my $options = $may_save ? "(R)eject, accept (t)emporarily or accept (p)ermanently? " : "(R)eject or accept (t)emporarily? "; - STDERR->flush; - $choice = lc(substr(<STDIN> || 'R', 0, 1)); + $choice = substr(Git->prompt("Certificate unknown. " . $options) || 'R', 0, 1); if ($choice =~ /^t$/i) { $cred->may_save(undef); } elsif ($choice =~ /^r$/i) { @@ -4378,10 +4377,7 @@ prompt: sub ssl_client_cert { my ($cred, $realm, $may_save, $pool) = @_; $may_save = undef if $_no_auth_cache; - print STDERR "Client certificate filename: "; - STDERR->flush; - chomp(my $filename = <STDIN>); - $cred->cert_file($filename); + $cred->cert_file(Git->prompt("Client certificate filename: ")); $cred->may_save($may_save); $SVN::_Core::SVN_NO_ERROR; } @@ -4404,9 +4400,7 @@ sub username { if (defined $_username) { $username = $_username; } else { - print STDERR "Username: "; - STDERR->flush; - chomp($username = <STDIN>); + $username = Git->prompt("Username: "); } $cred->username($username); $cred->may_save($may_save); @@ -4415,7 +4409,7 @@ sub username { sub _read_password { my ($prompt, $realm) = @_; - my $password = Git->prompt($prompt); + my $password = Git->prompt($prompt, 1); $password; } diff --git a/perl/Git.pm b/perl/Git.pm index b1c7c50..62b824c 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -512,18 +512,19 @@ C<git --html-path>). Useful mostly only internally. sub html_path { command_oneline('--html-path') } -=item prompt ( PROMPT ) +=item prompt ( PROMPT , ISPASSWORD ) Query user C<PROMPT> and return answer from user. Check if GIT_ASKPASS or SSH_ASKPASS is set, use first matching for querying user and return answer. If no *_ASKPASS variable is set, the variable is empty or an error occoured, the terminal is tried as a fallback. +If C<ISPASSWORD> is set and true, the terminal disables echo. =cut sub prompt { - my ($self, $prompt) = _maybe_self(@_); + my ($self, $prompt, $isPassword) = _maybe_self(@_); my $ret; if (exists $ENV{'GIT_ASKPASS'}) { $ret = _prompt($ENV{'GIT_ASKPASS'}, $prompt); @@ -534,15 +535,19 @@ sub prompt { if (!defined $ret) { print STDERR $prompt; STDERR->flush; - require Term::ReadKey; - Term::ReadKey::ReadMode('noecho'); - while (defined(my $key = Term::ReadKey::ReadKey(0))) { - last if $key =~ /[\012\015]/; # \n\r - $ret .= $key; + if (defined $isPassword && $isPassword) { + require Term::ReadKey; + Term::ReadKey::ReadMode('noecho'); + while (defined(my $key = Term::ReadKey::ReadKey(0))) { + last if $key =~ /[\012\015]/; # \n\r + $ret .= $key; + } + Term::ReadKey::ReadMode('restore'); + print STDERR "\n"; + STDERR->flush; + } else { + chomp($ret = <STDIN>); } - Term::ReadKey::ReadMode('restore'); - print STDERR "\n"; - STDERR->flush; } return $ret; } -- Best regards, Sven Strickroth ClamAV, a GPL anti-virus toolkit http://www.clamav.net PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html