kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-svn: Eliminate temp file usage in libsvn_get_file() 

This means we'll have a loose object when we encounter a symlink
but that's not the common case.

We also don't have to worry about svn:eol-style when using the
SVN libraries, either.  So remove the code to deal with that.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
maint
Eric Wong 2006-06-15 13:36:12 -07:00
parent cf7424b021
commit 968bdf1f3d
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
contrib/git-svn/git-svn.perl
View File

@ -31,6 +31,7 @@ use File::Path qw/mkpath/;
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/; use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
use File::Spec qw//; use File::Spec qw//;
use POSIX qw/strftime/; use POSIX qw/strftime/;
use IPC::Open3;
use Memoize; use Memoize;
memoize('revisions_eq'); memoize('revisions_eq');


@ -2335,47 +2336,36 @@ sub libsvn_get_file {
my $p = $f; my $p = $f;
return unless ($p =~ s#^\Q$SVN_PATH\E/?##); return unless ($p =~ s#^\Q$SVN_PATH\E/?##);


my $fd = IO::File->new_tmpfile or croak $!; my ($hash, $pid, $in, $out);
my $pool = SVN::Pool->new; my $pool = SVN::Pool->new;
my ($r, $props) = $SVN->get_file($f, $rev, $fd, $pool); defined($pid = open3($in, $out, '>&STDERR',
qw/git-hash-object -w --stdin/)) or croak $!;
my ($r, $props) = $SVN->get_file($f, $rev, $in, $pool);
$in->flush == 0 or croak $!;
close $in or croak $!;
$pool->clear; $pool->clear;
$fd->flush == 0 or croak $!; chomp($hash = do { local $/; <$out> });
seek $fd, 0, 0 or croak $!; close $out or croak $!;
if (my $es = $props->{'svn:eol-style'}) { waitpid $pid, 0;
my $new_fd = IO::File->new_tmpfile or croak $!; $hash =~ /^$sha1$/o or die "not a sha1: $hash\n";
eol_cp_fd($fd, $new_fd, $es);
close $fd or croak $!; my $mode = exists $props->{'svn:executable'} ? '100755' : '100644';
$fd = $new_fd;
seek $fd, 0, 0 or croak $!;
$fd->flush == 0 or croak $!;
}
my $mode = '100644';
if (exists $props->{'svn:executable'}) {
$mode = '100755';
}
if (exists $props->{'svn:special'}) { if (exists $props->{'svn:special'}) {
$mode = '120000'; $mode = '120000';
local $/; my $link = `git-cat-file blob $hash`;
my $link = <$fd>;
$link =~ s/^link // or die "svn:special file with contents: <", $link =~ s/^link // or die "svn:special file with contents: <",
$link, "> is not understood\n"; $link, "> is not understood\n";
seek $fd, 0, 0 or croak $!; defined($pid = open3($in, $out, '>&STDERR',
truncate $fd, 0 or croak $!; qw/git-hash-object -w --stdin/)) or croak $!;
print $fd $link or croak $!; print $in $link;
seek $fd, 0, 0 or croak $!; $in->flush == 0 or croak $!;
$fd->flush == 0 or croak $!; close $in or croak $!;
} chomp($hash = do { local $/; <$out> });
my $pid = open my $ho, '-|'; close $out or croak $!;
defined $pid or croak $!; waitpid $pid, 0;
if (!$pid) {
open STDIN, '<&', $fd or croak $!;
exec qw/git-hash-object -w --stdin/ or croak $!;
}
chomp(my $hash = do { local $/; <$ho> });
close $ho or croak $?;
$hash =~ /^$sha1$/o or die "not a sha1: $hash\n"; $hash =~ /^$sha1$/o or die "not a sha1: $hash\n";
}
print $gui $mode,' ',$hash,"\t",$p,"\0" or croak $!; print $gui $mode,' ',$hash,"\t",$p,"\0" or croak $!;
close $fd or croak $?;
} }


sub libsvn_log_entry { sub libsvn_log_entry {