mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

Browse Source 
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 helper, 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@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sven Strickroth
2012-12-18 01:28:48 +01:00
committed by Junio C Hamano
parent 8f3cab2b4d
commit e9263e4580
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
perl/Git/SVN/Prompt.pm
View File

@ -62,16 +62,16 @@ 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));
if ($choice =~ /^t$/i) {
$choice = lc(substr(Git::prompt("Certificate problem.\n" . $options) || 'R', 0, 1));
if ($choice eq 't') {
$cred->may_save(undef);
} elsif ($choice =~ /^r$/i) {
} elsif ($choice eq 'r') {
return -1;
} elsif ($may_save && $choice =~ /^p$/i) {
} elsif ($may_save && $choice eq 'p') {
$cred->may_save($may_save);
} else {
goto prompt;
@ -109,9 +109,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);
@ -120,7 +118,7 @@ sub username {
sub _read_password {
my ($prompt, $realm) = @_;
my $password = Git::prompt($prompt);
my $password = Git::prompt($prompt, 1);
$password;
}