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

svn import: add eval()

Browse Source 
Trying to downlaod a file that's really a subdirectory doesn't work too well.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
This commit is contained in:
Matthias Urlichs 2005-10-10 12:33:22 +02:00
parent eaf718f3ec
commit 2b5e63d1b4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-svnimport.perl
View File

@ -121,12 +121,15 @@ sub file {
my ($fh, $name) = tempfile('gitsvn.XXXXXX', my ($fh, $name) = tempfile('gitsvn.XXXXXX',
DIR => File::Spec->tmpdir(), UNLINK => 1); DIR => File::Spec->tmpdir(), UNLINK => 1);
$self->{'svn'}->get_file($path,$rev,$fh) or do { print "... $rev $path ...\n" if $opt_v;
eval { $self->{'svn'}->get_file($path,$rev,$fh); };
if (defined $@ and $@ !~ /Attempted to get checksum/) {
# retry # retry
$self->conn(); $self->conn();
$self->{'svn'}->get_file($path,$rev,$fh) eval { $self->{'svn'}->get_file($path,$rev,$fh); };
or die "$rev: No file $path at $rev\n";
}; };
return () if defined $@ and $@ !~ /Attempted to get checksum/;
die $@ if $@;
close ($fh); close ($fh);
return ($name, $res); return ($name, $res);
@ -308,7 +311,8 @@ sub get_file($$$) {
} }
# now get it # now get it
my ($name, $res) = $svn->file($svnpath,$rev); my ($name, $res) = eval { $svn->file($svnpath,$rev); };
return () unless defined $name;
open my $F, '-|', "git-hash-object -w $name" open my $F, '-|', "git-hash-object -w $name"
or die "Cannot create object: $!\n"; or die "Cannot create object: $!\n";
@ -343,7 +347,9 @@ sub commit {
my($author_name,$author_email,$dest); my($author_name,$author_email,$dest);
my(@old,@new); my(@old,@new);
if ($author =~ /^(.*?)\s+<(.*)>$/) { if (not defined $author) {
$author_name = $author_email = "unknown";
} elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
($author_name, $author_email) = ($1, $2); ($author_name, $author_email) = ($1, $2);
} else { } else {
$author =~ s/^<(.*)>$/$1/; $author =~ s/^<(.*)>$/$1/;