Git.pm: Add command_bidi_pipe and command_close_bidi_pipe

command_bidi_pipe hands back the stdin and stdout file handles from the
executed command. command_close_bidi_pipe closes these handles and terminates
the process.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adam Roben 2008-05-23 16:19:39 +02:00 коммит произвёл Junio C Hamano
Родитель d8ee483250
Коммит d1a29af98e
1 изменённых файлов: 56 добавлений и 0 удалений

Просмотреть файл

@ -51,6 +51,7 @@ require Exporter;
# Methods which can be called as standalone functions as well: # Methods which can be called as standalone functions as well:
@EXPORT_OK = qw(command command_oneline command_noisy @EXPORT_OK = qw(command command_oneline command_noisy
command_output_pipe command_input_pipe command_close_pipe command_output_pipe command_input_pipe command_close_pipe
command_bidi_pipe command_close_bidi_pipe
version exec_path hash_object git_cmd_try); version exec_path hash_object git_cmd_try);
@ -92,6 +93,7 @@ increate nonwithstanding).
use Carp qw(carp croak); # but croak is bad - throw instead use Carp qw(carp croak); # but croak is bad - throw instead
use Error qw(:try); use Error qw(:try);
use Cwd qw(abs_path); use Cwd qw(abs_path);
use IPC::Open2 qw(open2);
} }
@ -375,6 +377,60 @@ sub command_close_pipe {
_cmd_close($fh, $ctx); _cmd_close($fh, $ctx);
} }
=item command_bidi_pipe ( COMMAND [, ARGUMENTS... ] )
Execute the given C<COMMAND> in the same way as command_output_pipe()
does but return both an input pipe filehandle and an output pipe filehandle.
The function will return return C<($pid, $pipe_in, $pipe_out, $ctx)>.
See C<command_close_bidi_pipe()> for details.
=cut
sub command_bidi_pipe {
my ($pid, $in, $out);
$pid = open2($in, $out, 'git', @_);
return ($pid, $in, $out, join(' ', @_));
}
=item command_close_bidi_pipe ( PID, PIPE_IN, PIPE_OUT [, CTX] )
Close the C<PIPE_IN> and C<PIPE_OUT> as returned from C<command_bidi_pipe()>,
checking whether the command finished successfully. The optional C<CTX>
argument is required if you want to see the command name in the error message,
and it is the fourth value returned by C<command_bidi_pipe()>. The call idiom
is:
my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check');
print "000000000\n" $out;
while (<$in>) { ... }
$r->command_close_bidi_pipe($pid, $in, $out, $ctx);
Note that you should not rely on whatever actually is in C<CTX>;
currently it is simply the command name but in future the context might
have more complicated structure.
=cut
sub command_close_bidi_pipe {
my ($pid, $in, $out, $ctx) = @_;
foreach my $fh ($in, $out) {
unless (close $fh) {
if ($!) {
carp "error closing pipe: $!";
} elsif ($? >> 8) {
throw Git::Error::Command($ctx, $? >>8);
}
}
}
waitpid $pid, 0;
if ($? >> 8) {
throw Git::Error::Command($ctx, $? >>8);
}
}
=item command_noisy ( COMMAND [, ARGUMENTS... ] ) =item command_noisy ( COMMAND [, ARGUMENTS... ] )