undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: error out when the SVN connection fails during a fetch

Browse Source 
finish_report does seem to return a useful value indicating success
or failure, so we'll just set a flag when close_edit is called
(it is not called on failures, nor is abort_edit) and check
the flag before proceeding.

Thanks to Pazu for pointing this out.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-11-28 14:06:05 -08:00 committed by Junio C Hamano
parent c3e4393883
commit dad73c0bb9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-svn.perl
View File

@ -2939,6 +2939,9 @@ sub libsvn_fetch_delta {
$reporter->set_path('', $last_rev, 0, @lock, $pool); $reporter->set_path('', $last_rev, 0, @lock, $pool);
$reporter->finish_report($pool); $reporter->finish_report($pool);
$pool->clear; $pool->clear;
unless ($ed->{git_commit_ok}) {
die "SVN connection failed somewhere...\n";
}
libsvn_log_entry($rev, $author, $date, $msg, [$last_commit]); libsvn_log_entry($rev, $author, $date, $msg, [$last_commit]);
} }
@ -3193,6 +3196,9 @@ sub libsvn_new_tree {
$reporter->set_path('', $rev, 1, @lock, $pool); $reporter->set_path('', $rev, 1, @lock, $pool);
$reporter->finish_report($pool); $reporter->finish_report($pool);
$pool->clear; $pool->clear;
unless ($ed->{git_commit_ok}) {
die "SVN connection failed somewhere...\n";
}
} else { } else {
open my $gui, '| git-update-index -z --index-info' or croak $!; open my $gui, '| git-update-index -z --index-info' or croak $!;
libsvn_traverse($gui, '', $SVN->{svn_path}, $rev); libsvn_traverse($gui, '', $SVN->{svn_path}, $rev);
@ -3506,7 +3512,8 @@ sub abort_edit {
sub close_edit { sub close_edit {
my $self = shift; my $self = shift;
close $self->{gui} or croak; close $self->{gui} or croak $!;
$self->{git_commit_ok} = 1;
$self->SUPER::close_edit(@_); $self->SUPER::close_edit(@_);
} }