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

Git.pm: Use File::Temp->tempfile instead of ->new

Browse Source 
Perl 5.8.0 ships with File::Temp 0.13, which does not have the new()
interface introduced in 0.14, as pointed out by Tom G. Christensen.

This modifies Git.pm to use the more established tempfile() interface
and updates 'git svn' to match.

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Marcus Griep
2008-09-08 12:53:01 -04:00
committed by Junio C Hamano
parent 1e368681bd
commit 836ff95df6
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-svn.perl
View File

@ -3284,7 +3284,7 @@ sub close_file {
my $out = syswrite($tmp_fh, $str, $res); my $out = syswrite($tmp_fh, $str, $res);
defined($out) && $out == $res defined($out) && $out == $res
or croak("write ", or croak("write ",
$tmp_fh->filename, Git::temp_path($tmp_fh),
": $!\n"); ": $!\n");
} }
defined $res or croak $!; defined $res or croak $!;
@ -3295,7 +3295,7 @@ sub close_file {
} }
$hash = $::_repository->hash_and_insert_object( $hash = $::_repository->hash_and_insert_object(
$fh->filename); Git::temp_path($fh));
$hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
Git::temp_release($fb->{base}, 1); Git::temp_release($fb->{base}, 1);

42
perl/Git.pm
View File

@ -58,7 +58,7 @@ require Exporter;
command_bidi_pipe command_close_bidi_pipe command_bidi_pipe command_close_bidi_pipe
version exec_path hash_object git_cmd_try version exec_path hash_object git_cmd_try
remote_refs remote_refs
temp_acquire temp_release temp_reset); temp_acquire temp_release temp_reset temp_path);
=head1 DESCRIPTION =head1 DESCRIPTION
@ -937,7 +937,7 @@ sub _close_cat_blob {
{ # %TEMP_* Lexical Context { # %TEMP_* Lexical Context
my (%TEMP_LOCKS, %TEMP_FILES); my (%TEMP_FILEMAP, %TEMP_FILES);
=item temp_acquire ( NAME ) =item temp_acquire ( NAME )
@ -965,7 +965,7 @@ sub temp_acquire {
my $temp_fd = _temp_cache($name); my $temp_fd = _temp_cache($name);
$TEMP_LOCKS{$temp_fd} = 1; $TEMP_FILES{$temp_fd}{locked} = 1;
$temp_fd; $temp_fd;
} }
@ -991,16 +991,16 @@ the same string.
sub temp_release { sub temp_release {
my ($self, $temp_fd, $trunc) = _maybe_self(@_); my ($self, $temp_fd, $trunc) = _maybe_self(@_);
if (ref($temp_fd) ne 'File::Temp') { if (exists $TEMP_FILEMAP{$temp_fd}) {
$temp_fd = $TEMP_FILES{$temp_fd}; $temp_fd = $TEMP_FILES{$temp_fd};
} }
unless ($TEMP_LOCKS{$temp_fd}) { unless ($TEMP_FILES{$temp_fd}{locked}) {
carp "Attempt to release temp file '", carp "Attempt to release temp file '",
$temp_fd, "' that has not been locked"; $temp_fd, "' that has not been locked";
} }
temp_reset($temp_fd) if $trunc and $temp_fd->opened; temp_reset($temp_fd) if $trunc and $temp_fd->opened;
$TEMP_LOCKS{$temp_fd} = 0; $TEMP_FILES{$temp_fd}{locked} = 0;
undef; undef;
} }
@ -1009,9 +1009,9 @@ sub _temp_cache {
_verify_require(); _verify_require();
my $temp_fd = \$TEMP_FILES{$name}; my $temp_fd = \$TEMP_FILEMAP{$name};
if (defined $$temp_fd and $$temp_fd->opened) { if (defined $$temp_fd and $$temp_fd->opened) {
if ($TEMP_LOCKS{$$temp_fd}) { if ($TEMP_FILES{$$temp_fd}{locked}) {
throw Error::Simple("Temp file with moniker '", throw Error::Simple("Temp file with moniker '",
$name, "' already in use"); $name, "' already in use");
} }
@ -1021,12 +1021,13 @@ sub _temp_cache {
carp "Temp file '", $name, carp "Temp file '", $name,
"' was closed. Opening replacement."; "' was closed. Opening replacement.";
} }
$$temp_fd = File::Temp->new( my $fname;
TEMPLATE => 'Git_XXXXXX', ($$temp_fd, $fname) = File::Temp->tempfile(
DIR => File::Spec->tmpdir 'Git_XXXXXX', UNLINK => 1
) or throw Error::Simple("couldn't open new temp file"); ) or throw Error::Simple("couldn't open new temp file");
$$temp_fd->autoflush; $$temp_fd->autoflush;
binmode $$temp_fd; binmode $$temp_fd;
$TEMP_FILES{$$temp_fd}{fname} = $fname;
} }
$$temp_fd; $$temp_fd;
} }
@ -1053,8 +1054,25 @@ sub temp_reset {
or throw Error::Simple("expected file position to be reset"); or throw Error::Simple("expected file position to be reset");
} }
=item temp_path ( NAME )
=item temp_path ( FILEHANDLE )
Returns the filename associated with the given tempfile.
=cut
sub temp_path {
my ($self, $temp_fd) = _maybe_self(@_);
if (exists $TEMP_FILEMAP{$temp_fd}) {
$temp_fd = $TEMP_FILEMAP{$temp_fd};
}
$TEMP_FILES{$temp_fd}{fname};
}
sub END { sub END {
unlink values %TEMP_FILES if %TEMP_FILES; unlink values %TEMP_FILEMAP if %TEMP_FILEMAP;
} }
} # %TEMP_* Lexical Context } # %TEMP_* Lexical Context