Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
=head1 NAME
|
|
|
|
|
|
|
|
Git - Perl interface to the Git version control system
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
|
|
|
|
package Git;
|
|
|
|
|
2010-09-24 22:00:52 +02:00
|
|
|
use 5.008;
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
use strict;
|
|
|
|
|
|
|
|
|
|
|
|
BEGIN {
|
|
|
|
|
|
|
|
our ($VERSION, @ISA, @EXPORT, @EXPORT_OK);
|
|
|
|
|
|
|
|
# Totally unstable API.
|
|
|
|
$VERSION = '0.01';
|
|
|
|
|
|
|
|
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
|
|
|
|
use Git;
|
|
|
|
|
|
|
|
my $version = Git::command_oneline('version');
|
|
|
|
|
2006-06-24 04:34:44 +02:00
|
|
|
git_cmd_try { Git::command_noisy('update-server-info') }
|
|
|
|
'%s failed w/ code %d';
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
my $repo = Git->repository (Directory => '/srv/git/cogito.git');
|
|
|
|
|
|
|
|
|
|
|
|
my @revs = $repo->command('rev-list', '--since=last monday', '--all');
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
my ($fh, $c) = $repo->command_output_pipe('rev-list', '--since=last monday', '--all');
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
my $lastrev = <$fh>; chomp $lastrev;
|
2006-06-24 04:34:44 +02:00
|
|
|
$repo->command_close_pipe($fh, $c);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
my $lastrev = $repo->command_oneline( [ 'rev-list', '--all' ],
|
|
|
|
STDERR => 0 );
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2008-05-23 16:19:40 +02:00
|
|
|
my $sha1 = $repo->hash_and_insert_object('file.txt');
|
|
|
|
my $tempfile = tempfile();
|
|
|
|
my $size = $repo->cat_blob($sha1, $tempfile);
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
=cut
|
|
|
|
|
|
|
|
|
|
|
|
require Exporter;
|
|
|
|
|
|
|
|
@ISA = qw(Exporter);
|
|
|
|
|
2006-06-24 04:34:44 +02:00
|
|
|
@EXPORT = qw(git_cmd_try);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
# Methods which can be called as standalone functions as well:
|
2006-06-24 04:34:47 +02:00
|
|
|
@EXPORT_OK = qw(command command_oneline command_noisy
|
|
|
|
command_output_pipe command_input_pipe command_close_pipe
|
2008-05-23 16:19:39 +02:00
|
|
|
command_bidi_pipe command_close_bidi_pipe
|
2009-04-05 04:15:16 +02:00
|
|
|
version exec_path html_path hash_object git_cmd_try
|
2012-12-18 01:28:45 +01:00
|
|
|
remote_refs prompt
|
2016-10-14 02:27:53 +02:00
|
|
|
get_tz_offset get_record
|
2013-02-12 15:02:32 +01:00
|
|
|
credential credential_read credential_write
|
2017-06-30 11:49:09 +02:00
|
|
|
temp_acquire temp_is_locked temp_release temp_reset temp_path
|
|
|
|
unquote_path);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
|
|
|
|
This module provides Perl scripts easy way to interface the Git version control
|
|
|
|
system. The modules have an easy and well-tested way to call arbitrary Git
|
|
|
|
commands; in the future, the interface will also provide specialized methods
|
|
|
|
for doing easily operations which are not totally trivial to do over
|
|
|
|
the generic command interface.
|
|
|
|
|
|
|
|
While some commands can be executed outside of any context (e.g. 'version'
|
2007-01-12 22:01:46 +01:00
|
|
|
or 'init'), most operations require a repository context, which in practice
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
means getting an instance of the Git object using the repository() constructor.
|
|
|
|
(In the future, we will also get a new_repository() constructor.) All commands
|
|
|
|
called as methods of the object are then executed in the context of the
|
|
|
|
repository.
|
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
Part of the "repository state" is also information about path to the attached
|
|
|
|
working copy (unless you work with a bare repository). You can also navigate
|
|
|
|
inside of the working copy using the C<wc_chdir()> method. (Note that
|
|
|
|
the repository object is self-contained and will not change working directory
|
|
|
|
of your process.)
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
TODO: In the future, we might also do
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
my $remoterepo = $repo->remote_repository (Name => 'cogito', Branch => 'master');
|
|
|
|
$remoterepo ||= Git->remote_repository ('http://git.or.cz/cogito.git/');
|
|
|
|
my @refs = $remoterepo->refs();
|
|
|
|
|
|
|
|
Currently, the module merely wraps calls to external Git tools. In the future,
|
|
|
|
it will provide a much faster way to interact with Git by linking directly
|
|
|
|
to libgit. This should be completely opaque to the user, though (performance
|
2008-08-05 04:06:16 +02:00
|
|
|
increase notwithstanding).
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
|
2006-06-24 04:34:44 +02:00
|
|
|
use Carp qw(carp croak); # but croak is bad - throw instead
|
Makefile: replace perl/Makefile.PL with simple make rules
Replace the perl/Makefile.PL and the fallback perl/Makefile used under
NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily
inspired by how the i18n infrastructure's build process works[1].
The reason for having the Makefile.PL in the first place is that it
was initially[2] building a perl C binding to interface with libgit,
this functionality, that was removed[3] before Git.pm ever made it to
the master branch.
We've since since started maintaining a fallback perl/Makefile, as
MakeMaker wouldn't work on some platforms[4]. That's just the tip of
the iceberg. We have the PM.stamp hack in the top-level Makefile[5] to
detect whether we need to regenerate the perl/perl.mak, which I fixed
just recently to deal with issues like the perl version changing from
under us[6].
There is absolutely no reason for why this needs to be so complex
anymore. All we're getting out of this elaborate Rube Goldberg machine
was copying perl/* to perl/blib/* as we do a string-replacement on
the *.pm files to hardcode @@LOCALEDIR@@ in the source, as well as
pod2man-ing Git.pm & friends.
So replace the whole thing with something that's pretty much a copy of
how we generate po/build/**.mo from po/*.po, just with a small sed(1)
command instead of msgfmt. As that's being done rename the files
from *.pm to *.pmc just to indicate that they're generated (see
"perldoc -f require").
While I'm at it, change the fallback for Error.pm from being something
where we'll ship our own Error.pm if one doesn't exist at build time
to one where we just use a Git::Error wrapper that'll always prefer
the system-wide Error.pm, only falling back to our own copy if it
really doesn't exist at runtime. It's now shipped as
Git::FromCPAN::Error, making it easy to add other modules to
Git::FromCPAN::* in the future if that's needed.
Functional changes:
* This will not always install into perl's idea of its global
"installsitelib". This only potentially matters for packagers that
need to expose Git.pm for non-git use, and as explained in the
INSTALL file there's a trivial workaround.
* The scripts themselves will 'use lib' the target directory, but if
INSTLIBDIR is set it overrides it. It doesn't have to be this way,
it could be set in addition to INSTLIBDIR, but my reading of [7] is
that this is the desired behavior.
* We don't build man pages for all of the perl modules as we used to,
only Git(3pm). As discussed on-list[8] that we were building
installed manpages for purely internal APIs like Git::I18N or
private-Error.pm was always a bug anyway, and all the Git::SVN::*
ones say they're internal APIs.
There are apparently external users of Git.pm, but I don't expect
there to be any of the others.
As a side-effect of these general changes the perl documentation
now only installed by install-{doc,man}, not a mere "install" as
before.
1. 5e9637c629 ("i18n: add infrastructure for translating Git with
gettext", 2011-11-18)
2. b1edc53d06 ("Introduce Git.pm (v4)", 2006-06-24)
3. 18b0fc1ce1 ("Git.pm: Kill Git.xs for now", 2006-09-23)
4. f848718a69 ("Make perl/ build procedure ActiveState friendly.",
2006-12-04)
5. ee9be06770 ("perl: detect new files in MakeMaker builds",
2012-07-27)
6. c59c4939c2 ("perl: regenerate perl.mak if perl -V changes",
2017-03-29)
7. 0386dd37b1 ("Makefile: add PERLLIB_EXTRA variable that adds to
default perl path", 2013-11-15)
8. 87bmjjv1pu.fsf@evledraar.booking.com ("Re: [PATCH] Makefile:
replace perl/Makefile.PL with simple make rules"
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-10 22:13:33 +01:00
|
|
|
use Git::Error qw(:try);
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
use Cwd qw(abs_path cwd);
|
2008-05-23 16:19:39 +02:00
|
|
|
use IPC::Open2 qw(open2);
|
2008-08-12 18:00:18 +02:00
|
|
|
use Fcntl qw(SEEK_SET SEEK_CUR);
|
2013-02-09 22:46:57 +01:00
|
|
|
use Time::Local qw(timegm);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
=head1 CONSTRUCTORS
|
|
|
|
|
|
|
|
=over 4
|
|
|
|
|
|
|
|
=item repository ( OPTIONS )
|
|
|
|
|
|
|
|
=item repository ( DIRECTORY )
|
|
|
|
|
|
|
|
=item repository ()
|
|
|
|
|
|
|
|
Construct a new repository object.
|
|
|
|
C<OPTIONS> are passed in a hash like fashion, using key and value pairs.
|
|
|
|
Possible options are:
|
|
|
|
|
|
|
|
B<Repository> - Path to the Git repository.
|
|
|
|
|
|
|
|
B<WorkingCopy> - Path to the associated working copy; not strictly required
|
|
|
|
as many commands will happily crunch on a bare repository.
|
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
B<WorkingSubdir> - Subdirectory in the working copy to work inside.
|
|
|
|
Just left undefined if you do not want to limit the scope of operations.
|
|
|
|
|
|
|
|
B<Directory> - Path to the Git working directory in its usual setup.
|
|
|
|
The C<.git> directory is searched in the directory and all the parent
|
|
|
|
directories; if found, C<WorkingCopy> is set to the directory containing
|
|
|
|
it and C<Repository> to the C<.git> directory itself. If no C<.git>
|
|
|
|
directory was found, the C<Directory> is assumed to be a bare repository,
|
|
|
|
C<Repository> is set to point at it and C<WorkingCopy> is left undefined.
|
|
|
|
If the C<$GIT_DIR> environment variable is set, things behave as expected
|
|
|
|
as well.
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
You should not use both C<Directory> and either of C<Repository> and
|
|
|
|
C<WorkingCopy> - the results of that are undefined.
|
|
|
|
|
|
|
|
Alternatively, a directory path may be passed as a single scalar argument
|
|
|
|
to the constructor; it is equivalent to setting only the C<Directory> option
|
|
|
|
field.
|
|
|
|
|
|
|
|
Calling the constructor with no options whatsoever is equivalent to
|
2006-06-24 04:34:51 +02:00
|
|
|
calling it with C<< Directory => '.' >>. In general, if you are building
|
|
|
|
a standard porcelain command, simply doing C<< Git->repository() >> should
|
|
|
|
do the right thing and setup the object to reflect exactly where the user
|
|
|
|
is right now.
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub repository {
|
|
|
|
my $class = shift;
|
|
|
|
my @args = @_;
|
|
|
|
my %opts = ();
|
|
|
|
my $self;
|
|
|
|
|
|
|
|
if (defined $args[0]) {
|
|
|
|
if ($#args % 2 != 1) {
|
|
|
|
# Not a hash.
|
2006-06-24 04:34:42 +02:00
|
|
|
$#args == 0 or throw Error::Simple("bad usage");
|
|
|
|
%opts = ( Directory => $args[0] );
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
} else {
|
|
|
|
%opts = @args;
|
|
|
|
}
|
2006-06-24 04:34:51 +02:00
|
|
|
}
|
|
|
|
|
2008-12-29 01:25:00 +01:00
|
|
|
if (not defined $opts{Repository} and not defined $opts{WorkingCopy}
|
|
|
|
and not defined $opts{Directory}) {
|
|
|
|
$opts{Directory} = '.';
|
2006-06-24 04:34:51 +02:00
|
|
|
}
|
|
|
|
|
2008-12-29 01:25:00 +01:00
|
|
|
if (defined $opts{Directory}) {
|
2010-06-18 01:47:31 +02:00
|
|
|
-d $opts{Directory} or throw Error::Simple("Directory not found: $opts{Directory} $!");
|
2006-06-24 04:34:51 +02:00
|
|
|
|
|
|
|
my $search = Git->repository(WorkingCopy => $opts{Directory});
|
|
|
|
my $dir;
|
|
|
|
try {
|
|
|
|
$dir = $search->command_oneline(['rev-parse', '--git-dir'],
|
|
|
|
STDERR => 0);
|
|
|
|
} catch Git::Error::Command with {
|
|
|
|
$dir = undef;
|
|
|
|
};
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
if ($dir) {
|
2016-01-26 15:34:35 +01:00
|
|
|
_verify_require();
|
|
|
|
File::Spec->file_name_is_absolute($dir) or $dir = $opts{Directory} . '/' . $dir;
|
2009-05-07 15:41:28 +02:00
|
|
|
$opts{Repository} = abs_path($dir);
|
2006-06-24 04:34:51 +02:00
|
|
|
|
|
|
|
# If --git-dir went ok, this shouldn't die either.
|
|
|
|
my $prefix = $search->command_oneline('rev-parse', '--show-prefix');
|
|
|
|
$dir = abs_path($opts{Directory}) . '/';
|
|
|
|
if ($prefix) {
|
|
|
|
if (substr($dir, -length($prefix)) ne $prefix) {
|
|
|
|
throw Error::Simple("rev-parse confused me - $dir does not have trailing $prefix");
|
|
|
|
}
|
|
|
|
substr($dir, -length($prefix)) = '';
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
2006-06-24 04:34:51 +02:00
|
|
|
$opts{WorkingCopy} = $dir;
|
|
|
|
$opts{WorkingSubdir} = $prefix;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
# A bare repository? Let's see...
|
|
|
|
$dir = $opts{Directory};
|
|
|
|
|
|
|
|
unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
|
2010-02-04 06:23:18 +01:00
|
|
|
# Mimic git-rev-parse --git-dir error message:
|
2008-12-22 00:17:32 +01:00
|
|
|
throw Error::Simple("fatal: Not a git repository: $dir");
|
2006-06-24 04:34:51 +02:00
|
|
|
}
|
|
|
|
my $search = Git->repository(Repository => $dir);
|
|
|
|
try {
|
|
|
|
$search->command('symbolic-ref', 'HEAD');
|
|
|
|
} catch Git::Error::Command with {
|
2010-02-04 06:23:18 +01:00
|
|
|
# Mimic git-rev-parse --git-dir error message:
|
2008-12-22 00:17:32 +01:00
|
|
|
throw Error::Simple("fatal: Not a git repository: $dir");
|
2006-06-24 04:34:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
$opts{Repository} = abs_path($dir);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
2006-06-24 04:34:51 +02:00
|
|
|
|
|
|
|
delete $opts{Directory};
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
|
2006-09-03 07:58:48 +02:00
|
|
|
$self = { opts => \%opts };
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
bless $self, $class;
|
|
|
|
}
|
|
|
|
|
|
|
|
=back
|
|
|
|
|
|
|
|
=head1 METHODS
|
|
|
|
|
|
|
|
=over 4
|
|
|
|
|
|
|
|
=item command ( COMMAND [, ARGUMENTS... ] )
|
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
=item command ( [ COMMAND, ARGUMENTS... ], { Opt => Val ... } )
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
Execute the given Git C<COMMAND> (specify it without the 'git-'
|
|
|
|
prefix), optionally with the specified extra C<ARGUMENTS>.
|
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
The second more elaborate form can be used if you want to further adjust
|
|
|
|
the command execution. Currently, only one option is supported:
|
|
|
|
|
|
|
|
B<STDERR> - How to deal with the command's error output. By default (C<undef>)
|
|
|
|
it is delivered to the caller's C<STDERR>. A false value (0 or '') will cause
|
|
|
|
it to be thrown away. If you want to process it, you can get it in a filehandle
|
|
|
|
you specify, but you must be extremely careful; if the error output is not
|
|
|
|
very short and you want to read it in the same process as where you called
|
|
|
|
C<command()>, you are set up for a nice deadlock!
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
The method can be called without any instance or on a specified Git repository
|
|
|
|
(in that case the command will be run in the repository context).
|
|
|
|
|
|
|
|
In scalar context, it returns all the command output in a single string
|
|
|
|
(verbatim).
|
|
|
|
|
|
|
|
In array context, it returns an array containing lines printed to the
|
|
|
|
command's stdout (without trailing newlines).
|
|
|
|
|
|
|
|
In both cases, the command's stdin and stderr are the same as the caller's.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command {
|
2006-06-24 04:34:47 +02:00
|
|
|
my ($fh, $ctx) = command_output_pipe(@_);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
if (not defined wantarray) {
|
2006-06-24 04:34:44 +02:00
|
|
|
# Nothing to pepper the possible exception with.
|
2013-02-12 15:02:30 +01:00
|
|
|
_cmd_close($ctx, $fh);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
} elsif (not wantarray) {
|
|
|
|
local $/;
|
|
|
|
my $text = <$fh>;
|
2006-06-24 04:34:44 +02:00
|
|
|
try {
|
2013-02-12 15:02:30 +01:00
|
|
|
_cmd_close($ctx, $fh);
|
2006-06-24 04:34:44 +02:00
|
|
|
} catch Git::Error::Command with {
|
|
|
|
# Pepper with the output:
|
|
|
|
my $E = shift;
|
|
|
|
$E->{'-outputref'} = \$text;
|
|
|
|
throw $E;
|
|
|
|
};
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
return $text;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
my @lines = <$fh>;
|
2007-01-22 15:58:03 +01:00
|
|
|
defined and chomp for @lines;
|
2006-06-24 04:34:44 +02:00
|
|
|
try {
|
2013-02-12 15:02:30 +01:00
|
|
|
_cmd_close($ctx, $fh);
|
2006-06-24 04:34:44 +02:00
|
|
|
} catch Git::Error::Command with {
|
|
|
|
my $E = shift;
|
|
|
|
$E->{'-outputref'} = \@lines;
|
|
|
|
throw $E;
|
|
|
|
};
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
return @lines;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
=item command_oneline ( COMMAND [, ARGUMENTS... ] )
|
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
=item command_oneline ( [ COMMAND, ARGUMENTS... ], { Opt => Val ... } )
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
Execute the given C<COMMAND> in the same way as command()
|
|
|
|
does but always return a scalar string containing the first line
|
|
|
|
of the command's standard output.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command_oneline {
|
2006-06-24 04:34:47 +02:00
|
|
|
my ($fh, $ctx) = command_output_pipe(@_);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
my $line = <$fh>;
|
2006-06-24 04:34:51 +02:00
|
|
|
defined $line and chomp $line;
|
2006-06-24 04:34:44 +02:00
|
|
|
try {
|
2013-02-12 15:02:30 +01:00
|
|
|
_cmd_close($ctx, $fh);
|
2006-06-24 04:34:44 +02:00
|
|
|
} catch Git::Error::Command with {
|
|
|
|
# Pepper with the output:
|
|
|
|
my $E = shift;
|
|
|
|
$E->{'-outputref'} = \$line;
|
|
|
|
throw $E;
|
|
|
|
};
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
return $line;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
=item command_output_pipe ( COMMAND [, ARGUMENTS... ] )
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
=item command_output_pipe ( [ COMMAND, ARGUMENTS... ], { Opt => Val ... } )
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
Execute the given C<COMMAND> in the same way as command()
|
|
|
|
does but return a pipe filehandle from which the command output can be
|
|
|
|
read.
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
The function can return C<($pipe, $ctx)> in array context.
|
|
|
|
See C<command_close_pipe()> for details.
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
=cut
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
sub command_output_pipe {
|
|
|
|
_command_common_pipe('-|', @_);
|
|
|
|
}
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
=item command_input_pipe ( COMMAND [, ARGUMENTS... ] )
|
|
|
|
|
2006-06-24 04:34:49 +02:00
|
|
|
=item command_input_pipe ( [ COMMAND, ARGUMENTS... ], { Opt => Val ... } )
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
Execute the given C<COMMAND> in the same way as command_output_pipe()
|
|
|
|
does but return an input pipe filehandle instead; the command output
|
|
|
|
is not captured.
|
|
|
|
|
|
|
|
The function can return C<($pipe, $ctx)> in array context.
|
|
|
|
See C<command_close_pipe()> for details.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command_input_pipe {
|
|
|
|
_command_common_pipe('|-', @_);
|
2006-06-24 04:34:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
=item command_close_pipe ( PIPE [, CTX ] )
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
Close the C<PIPE> as returned from C<command_*_pipe()>, checking
|
2007-02-04 05:49:16 +01:00
|
|
|
whether the command finished successfully. The optional C<CTX> argument
|
2006-06-24 04:34:44 +02:00
|
|
|
is required if you want to see the command name in the error message,
|
2006-06-24 04:34:47 +02:00
|
|
|
and it is the second value returned by C<command_*_pipe()> when
|
2006-06-24 04:34:44 +02:00
|
|
|
called in array context. The call idiom is:
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
my ($fh, $ctx) = $r->command_output_pipe('status');
|
|
|
|
while (<$fh>) { ... }
|
|
|
|
$r->command_close_pipe($fh, $ctx);
|
2006-06-24 04:34:44 +02:00
|
|
|
|
|
|
|
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_pipe {
|
|
|
|
my ($self, $fh, $ctx) = _maybe_self(@_);
|
|
|
|
$ctx ||= '<unknown>';
|
2013-02-12 15:02:30 +01:00
|
|
|
_cmd_close($ctx, $fh);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
|
2008-05-23 16:19:39 +02:00
|
|
|
=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.
|
|
|
|
|
2016-05-06 14:36:46 +02:00
|
|
|
The function will return C<($pid, $pipe_in, $pipe_out, $ctx)>.
|
2008-05-23 16:19:39 +02:00
|
|
|
See C<command_close_bidi_pipe()> for details.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command_bidi_pipe {
|
|
|
|
my ($pid, $in, $out);
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
my ($self) = _maybe_self(@_);
|
|
|
|
local %ENV = %ENV;
|
|
|
|
my $cwd_save = undef;
|
|
|
|
if ($self) {
|
|
|
|
shift;
|
|
|
|
$cwd_save = cwd();
|
|
|
|
_setup_git_cmd_env($self);
|
|
|
|
}
|
2008-05-23 16:19:39 +02:00
|
|
|
$pid = open2($in, $out, 'git', @_);
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
chdir($cwd_save) if $cwd_save;
|
2008-05-23 16:19:39 +02:00
|
|
|
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');
|
2013-02-07 15:01:18 +01:00
|
|
|
print $out "000000000\n";
|
2008-05-23 16:19:39 +02:00
|
|
|
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.
|
|
|
|
|
2013-02-12 15:02:31 +01:00
|
|
|
C<PIPE_IN> and C<PIPE_OUT> may be C<undef> if they have been closed prior to
|
|
|
|
calling this function. This may be useful in a query-response type of
|
|
|
|
commands where caller first writes a query and later reads response, eg:
|
|
|
|
|
|
|
|
my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check');
|
|
|
|
print $out "000000000\n";
|
|
|
|
close $out;
|
|
|
|
while (<$in>) { ... }
|
|
|
|
$r->command_close_bidi_pipe($pid, $in, undef, $ctx);
|
|
|
|
|
|
|
|
This idiom may prevent potential dead locks caused by data sent to the output
|
|
|
|
pipe not being flushed and thus not reaching the executed command.
|
|
|
|
|
2008-05-23 16:19:39 +02:00
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command_close_bidi_pipe {
|
2008-08-04 13:38:27 +02:00
|
|
|
local $?;
|
2013-02-07 15:01:17 +01:00
|
|
|
my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_);
|
2013-02-12 15:02:31 +01:00
|
|
|
_cmd_close($ctx, (grep { defined } ($in, $out)));
|
2008-05-23 16:19:39 +02:00
|
|
|
waitpid $pid, 0;
|
|
|
|
if ($? >> 8) {
|
|
|
|
throw Git::Error::Command($ctx, $? >>8);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
=item command_noisy ( COMMAND [, ARGUMENTS... ] )
|
|
|
|
|
|
|
|
Execute the given C<COMMAND> in the same way as command() does but do not
|
|
|
|
capture the command output - the standard output is not redirected and goes
|
|
|
|
to the standard output of the caller application.
|
|
|
|
|
|
|
|
While the method is called command_noisy(), you might want to as well use
|
|
|
|
it for the most silent Git commands which you know will never pollute your
|
|
|
|
stdout but you want to avoid the overhead of the pipe setup when calling them.
|
|
|
|
|
|
|
|
The function returns only after the command has finished running.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub command_noisy {
|
|
|
|
my ($self, $cmd, @args) = _maybe_self(@_);
|
2006-06-24 04:34:47 +02:00
|
|
|
_check_valid_cmd($cmd);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
my $pid = fork;
|
|
|
|
if (not defined $pid) {
|
2006-06-24 04:34:42 +02:00
|
|
|
throw Error::Simple("fork failed: $!");
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
} elsif ($pid == 0) {
|
|
|
|
_cmd_exec($self, $cmd, @args);
|
|
|
|
}
|
2006-06-24 04:34:44 +02:00
|
|
|
if (waitpid($pid, 0) > 0 and $?>>8 != 0) {
|
|
|
|
throw Git::Error::Command(join(' ', $cmd, @args), $? >> 8);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-24 04:34:36 +02:00
|
|
|
=item version ()
|
|
|
|
|
|
|
|
Return the Git version in use.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
2006-09-23 20:20:47 +02:00
|
|
|
sub version {
|
|
|
|
my $verstr = command_oneline('--version');
|
|
|
|
$verstr =~ s/^git version //;
|
|
|
|
$verstr;
|
|
|
|
}
|
2006-06-24 04:34:36 +02:00
|
|
|
|
|
|
|
|
2006-06-24 04:34:31 +02:00
|
|
|
=item exec_path ()
|
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
Return path to the Git sub-command executables (the same as
|
2006-06-24 04:34:31 +02:00
|
|
|
C<git --exec-path>). Useful mostly only internally.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
2006-09-23 20:20:47 +02:00
|
|
|
sub exec_path { command_oneline('--exec-path') }
|
2006-06-24 04:34:31 +02:00
|
|
|
|
|
|
|
|
2009-04-05 04:15:16 +02:00
|
|
|
=item html_path ()
|
|
|
|
|
|
|
|
Return path to the Git html documentation (the same as
|
|
|
|
C<git --html-path>). Useful mostly only internally.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub html_path { command_oneline('--html-path') }
|
|
|
|
|
2013-02-09 22:46:56 +01:00
|
|
|
|
|
|
|
=item get_tz_offset ( TIME )
|
|
|
|
|
|
|
|
Return the time zone offset from GMT in the form +/-HHMM where HH is
|
|
|
|
the number of hours from GMT and MM is the number of minutes. This is
|
|
|
|
the equivalent of what strftime("%z", ...) would provide on a GNU
|
|
|
|
platform.
|
|
|
|
|
|
|
|
If TIME is not supplied, the current local time is used.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub get_tz_offset {
|
2017-08-08 00:15:57 +02:00
|
|
|
# some systems don't handle or mishandle %z, so be creative.
|
2013-02-09 22:46:56 +01:00
|
|
|
my $t = shift || time;
|
2013-02-09 22:46:57 +01:00
|
|
|
my $gm = timegm(localtime($t));
|
|
|
|
my $sign = qw( + + - )[ $gm <=> $t ];
|
2013-02-09 22:46:56 +01:00
|
|
|
return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
|
|
|
|
}
|
|
|
|
|
2016-10-14 02:27:53 +02:00
|
|
|
=item get_record ( FILEHANDLE, INPUT_RECORD_SEPARATOR )
|
|
|
|
|
|
|
|
Read one record from FILEHANDLE delimited by INPUT_RECORD_SEPARATOR,
|
|
|
|
removing any trailing INPUT_RECORD_SEPARATOR.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub get_record {
|
|
|
|
my ($fh, $rs) = @_;
|
|
|
|
local $/ = $rs;
|
|
|
|
my $rec = <$fh>;
|
|
|
|
chomp $rec if defined $rs;
|
|
|
|
$rec;
|
|
|
|
}
|
2013-02-09 22:46:56 +01:00
|
|
|
|
2012-12-18 01:28:48 +01:00
|
|
|
=item prompt ( PROMPT , ISPASSWORD )
|
2012-12-18 01:28:45 +01:00
|
|
|
|
|
|
|
Query user C<PROMPT> and return answer from user.
|
|
|
|
|
2012-12-18 01:28:47 +01:00
|
|
|
Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
|
|
|
|
the user. If no *_ASKPASS variable is set or an error occoured,
|
2012-12-18 01:28:45 +01:00
|
|
|
the terminal is tried as a fallback.
|
2012-12-18 01:28:48 +01:00
|
|
|
If C<ISPASSWORD> is set and true, the terminal disables echo.
|
2012-12-18 01:28:45 +01:00
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub prompt {
|
2012-12-18 01:28:48 +01:00
|
|
|
my ($prompt, $isPassword) = @_;
|
2012-12-18 01:28:45 +01:00
|
|
|
my $ret;
|
|
|
|
if (exists $ENV{'GIT_ASKPASS'}) {
|
|
|
|
$ret = _prompt($ENV{'GIT_ASKPASS'}, $prompt);
|
|
|
|
}
|
2012-12-18 01:28:47 +01:00
|
|
|
if (!defined $ret && exists $ENV{'SSH_ASKPASS'}) {
|
|
|
|
$ret = _prompt($ENV{'SSH_ASKPASS'}, $prompt);
|
|
|
|
}
|
2012-12-18 01:28:45 +01:00
|
|
|
if (!defined $ret) {
|
|
|
|
print STDERR $prompt;
|
|
|
|
STDERR->flush;
|
2012-12-18 01:28:48 +01:00
|
|
|
if (defined $isPassword && $isPassword) {
|
|
|
|
require Term::ReadKey;
|
|
|
|
Term::ReadKey::ReadMode('noecho');
|
|
|
|
$ret = '';
|
|
|
|
while (defined(my $key = Term::ReadKey::ReadKey(0))) {
|
|
|
|
last if $key =~ /[\012\015]/; # \n\r
|
|
|
|
$ret .= $key;
|
|
|
|
}
|
|
|
|
Term::ReadKey::ReadMode('restore');
|
|
|
|
print STDERR "\n";
|
|
|
|
STDERR->flush;
|
|
|
|
} else {
|
|
|
|
chomp($ret = <STDIN>);
|
2012-12-18 01:28:45 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return $ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub _prompt {
|
|
|
|
my ($askpass, $prompt) = @_;
|
|
|
|
return unless length $askpass;
|
2012-12-18 01:28:48 +01:00
|
|
|
$prompt =~ s/\n/ /g;
|
2012-12-18 01:28:45 +01:00
|
|
|
my $ret;
|
|
|
|
open my $fh, "-|", $askpass, $prompt or return;
|
|
|
|
$ret = <$fh>;
|
|
|
|
$ret =~ s/[\015\012]//g; # strip \r\n, chomp does not work on all systems (i.e. windows) as expected
|
|
|
|
close ($fh);
|
|
|
|
return $ret;
|
|
|
|
}
|
2009-04-05 04:15:16 +02:00
|
|
|
|
2006-06-24 04:34:51 +02:00
|
|
|
=item repo_path ()
|
|
|
|
|
|
|
|
Return path to the git repository. Must be called on a repository instance.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub repo_path { $_[0]->{opts}->{Repository} }
|
|
|
|
|
|
|
|
|
|
|
|
=item wc_path ()
|
|
|
|
|
|
|
|
Return path to the working copy. Must be called on a repository instance.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub wc_path { $_[0]->{opts}->{WorkingCopy} }
|
|
|
|
|
|
|
|
|
|
|
|
=item wc_subdir ()
|
|
|
|
|
|
|
|
Return path to the subdirectory inside of a working copy. Must be called
|
|
|
|
on a repository instance.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub wc_subdir { $_[0]->{opts}->{WorkingSubdir} ||= '' }
|
|
|
|
|
|
|
|
|
|
|
|
=item wc_chdir ( SUBDIR )
|
|
|
|
|
|
|
|
Change the working copy subdirectory to work within. The C<SUBDIR> is
|
|
|
|
relative to the working copy root directory (not the current subdirectory).
|
|
|
|
Must be called on a repository instance attached to a working copy
|
|
|
|
and the directory must exist.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub wc_chdir {
|
|
|
|
my ($self, $subdir) = @_;
|
|
|
|
$self->wc_path()
|
|
|
|
or throw Error::Simple("bare repository");
|
|
|
|
|
|
|
|
-d $self->wc_path().'/'.$subdir
|
2010-06-18 01:47:31 +02:00
|
|
|
or throw Error::Simple("subdir not found: $subdir $!");
|
2006-06-24 04:34:51 +02:00
|
|
|
# Of course we will not "hold" the subdirectory so anyone
|
|
|
|
# can delete it now and we will never know. But at least we tried.
|
|
|
|
|
|
|
|
$self->{opts}->{WorkingSubdir} = $subdir;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-07-03 22:47:55 +02:00
|
|
|
=item config ( VARIABLE )
|
|
|
|
|
2007-01-29 01:16:53 +01:00
|
|
|
Retrieve the configuration C<VARIABLE> in the same manner as C<config>
|
2006-07-03 22:47:55 +02:00
|
|
|
does. In scalar context requires the variable to be set only one time
|
|
|
|
(exception is thrown otherwise), in array context returns allows the
|
|
|
|
variable to be set multiple times and returns all the values.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub config {
|
2011-10-18 11:47:01 +02:00
|
|
|
return _config_common({}, @_);
|
2006-07-03 22:47:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-05-09 12:49:41 +02:00
|
|
|
=item config_bool ( VARIABLE )
|
2007-02-20 21:13:42 +01:00
|
|
|
|
2007-05-09 12:49:41 +02:00
|
|
|
Retrieve the bool configuration C<VARIABLE>. The return value
|
|
|
|
is usable as a boolean in perl (and C<undef> if it's not defined,
|
|
|
|
of course).
|
2007-02-20 21:13:42 +01:00
|
|
|
|
|
|
|
=cut
|
|
|
|
|
2007-05-09 12:49:41 +02:00
|
|
|
sub config_bool {
|
2011-10-18 11:47:01 +02:00
|
|
|
my $val = scalar _config_common({'kind' => '--bool'}, @_);
|
2007-02-20 21:13:42 +01:00
|
|
|
|
2011-10-18 11:47:01 +02:00
|
|
|
# Do not rewrite this as return (defined $val && $val eq 'true')
|
|
|
|
# as some callers do care what kind of falsehood they receive.
|
|
|
|
if (!defined $val) {
|
|
|
|
return undef;
|
|
|
|
} else {
|
2007-05-09 12:49:41 +02:00
|
|
|
return $val eq 'true';
|
2011-10-18 11:47:01 +02:00
|
|
|
}
|
2007-02-20 21:13:42 +01:00
|
|
|
}
|
|
|
|
|
2011-09-30 12:52:24 +02:00
|
|
|
|
|
|
|
=item config_path ( VARIABLE )
|
|
|
|
|
|
|
|
Retrieve the path configuration C<VARIABLE>. The return value
|
|
|
|
is an expanded path or C<undef> if it's not defined.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub config_path {
|
2011-10-18 11:47:01 +02:00
|
|
|
return _config_common({'kind' => '--path'}, @_);
|
2011-09-30 12:52:24 +02:00
|
|
|
}
|
|
|
|
|
2011-10-18 11:47:01 +02:00
|
|
|
|
2007-11-23 19:04:52 +01:00
|
|
|
=item config_int ( VARIABLE )
|
|
|
|
|
|
|
|
Retrieve the integer configuration C<VARIABLE>. The return value
|
|
|
|
is simple decimal number. An optional value suffix of 'k', 'm',
|
|
|
|
or 'g' in the config file will cause the value to be multiplied
|
|
|
|
by 1024, 1048576 (1024^2), or 1073741824 (1024^3) prior to output.
|
2015-02-18 18:32:20 +01:00
|
|
|
It would return C<undef> if configuration variable is not defined.
|
2007-11-23 19:04:52 +01:00
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub config_int {
|
2011-10-18 11:47:01 +02:00
|
|
|
return scalar _config_common({'kind' => '--int'}, @_);
|
|
|
|
}
|
|
|
|
|
|
|
|
# Common subroutine to implement bulk of what the config* family of methods
|
2015-02-18 18:32:20 +01:00
|
|
|
# do. This currently wraps command('config') so it is not so fast.
|
2011-10-18 11:47:01 +02:00
|
|
|
sub _config_common {
|
|
|
|
my ($opts) = shift @_;
|
2008-03-14 18:29:28 +01:00
|
|
|
my ($self, $var) = _maybe_self(@_);
|
2007-11-23 19:04:52 +01:00
|
|
|
|
|
|
|
try {
|
2011-10-18 11:47:01 +02:00
|
|
|
my @cmd = ('config', $opts->{'kind'} ? $opts->{'kind'} : ());
|
2008-03-14 18:29:28 +01:00
|
|
|
unshift @cmd, $self if $self;
|
2011-10-18 11:47:01 +02:00
|
|
|
if (wantarray) {
|
|
|
|
return command(@cmd, '--get-all', $var);
|
|
|
|
} else {
|
|
|
|
return command_oneline(@cmd, '--get', $var);
|
|
|
|
}
|
2007-11-23 19:04:52 +01:00
|
|
|
} catch Git::Error::Command with {
|
|
|
|
my $E = shift;
|
|
|
|
if ($E->value() == 1) {
|
|
|
|
# Key not found.
|
2011-10-18 11:47:01 +02:00
|
|
|
return;
|
2007-11-23 19:04:52 +01:00
|
|
|
} else {
|
|
|
|
throw $E;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2007-02-20 21:13:42 +01:00
|
|
|
|
2007-12-05 09:50:23 +01:00
|
|
|
=item get_colorbool ( NAME )
|
|
|
|
|
|
|
|
Finds if color should be used for NAMEd operation from the configuration,
|
|
|
|
and returns boolean (true for "use color", false for "do not use color").
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub get_colorbool {
|
|
|
|
my ($self, $var) = @_;
|
|
|
|
my $stdout_to_tty = (-t STDOUT) ? "true" : "false";
|
|
|
|
my $use_color = $self->command_oneline('config', '--get-colorbool',
|
|
|
|
$var, $stdout_to_tty);
|
|
|
|
return ($use_color eq 'true');
|
|
|
|
}
|
|
|
|
|
|
|
|
=item get_color ( SLOT, COLOR )
|
|
|
|
|
|
|
|
Finds color for SLOT from the configuration, while defaulting to COLOR,
|
|
|
|
and returns the ANSI color escape sequence:
|
|
|
|
|
|
|
|
print $repo->get_color("color.interactive.prompt", "underline blue white");
|
|
|
|
print "some text";
|
|
|
|
print $repo->get_color("", "normal");
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub get_color {
|
|
|
|
my ($self, $slot, $default) = @_;
|
|
|
|
my $color = $self->command_oneline('config', '--get-color', $slot, $default);
|
|
|
|
if (!defined $color) {
|
|
|
|
$color = "";
|
|
|
|
}
|
|
|
|
return $color;
|
|
|
|
}
|
|
|
|
|
2008-07-08 19:48:04 +02:00
|
|
|
=item remote_refs ( REPOSITORY [, GROUPS [, REFGLOBS ] ] )
|
|
|
|
|
|
|
|
This function returns a hashref of refs stored in a given remote repository.
|
|
|
|
The hash is in the format C<refname =\> hash>. For tags, the C<refname> entry
|
|
|
|
contains the tag object while a C<refname^{}> entry gives the tagged objects.
|
|
|
|
|
|
|
|
C<REPOSITORY> has the same meaning as the appropriate C<git-ls-remote>
|
2012-03-28 10:41:54 +02:00
|
|
|
argument; either a URL or a remote name (if called on a repository instance).
|
2008-07-08 19:48:04 +02:00
|
|
|
C<GROUPS> is an optional arrayref that can contain 'tags' to return all the
|
|
|
|
tags and/or 'heads' to return all the heads. C<REFGLOB> is an optional array
|
|
|
|
of strings containing a shell-like glob to further limit the refs returned in
|
|
|
|
the hash; the meaning is again the same as the appropriate C<git-ls-remote>
|
|
|
|
argument.
|
|
|
|
|
|
|
|
This function may or may not be called on a repository instance. In the former
|
|
|
|
case, remote names as defined in the repository are recognized as repository
|
|
|
|
specifiers.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub remote_refs {
|
|
|
|
my ($self, $repo, $groups, $refglobs) = _maybe_self(@_);
|
|
|
|
my @args;
|
|
|
|
if (ref $groups eq 'ARRAY') {
|
|
|
|
foreach (@$groups) {
|
|
|
|
if ($_ eq 'heads') {
|
|
|
|
push (@args, '--heads');
|
|
|
|
} elsif ($_ eq 'tags') {
|
|
|
|
push (@args, '--tags');
|
|
|
|
} else {
|
|
|
|
# Ignore unknown groups for future
|
|
|
|
# compatibility
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
push (@args, $repo);
|
|
|
|
if (ref $refglobs eq 'ARRAY') {
|
|
|
|
push (@args, @$refglobs);
|
|
|
|
}
|
|
|
|
|
|
|
|
my @self = $self ? ($self) : (); # Ultra trickery
|
|
|
|
my ($fh, $ctx) = Git::command_output_pipe(@self, 'ls-remote', @args);
|
|
|
|
my %refs;
|
|
|
|
while (<$fh>) {
|
|
|
|
chomp;
|
|
|
|
my ($hash, $ref) = split(/\t/, $_, 2);
|
|
|
|
$refs{$ref} = $hash;
|
|
|
|
}
|
|
|
|
Git::command_close_pipe(@self, $fh, $ctx);
|
|
|
|
return \%refs;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-07-03 22:48:01 +02:00
|
|
|
=item ident ( TYPE | IDENTSTR )
|
|
|
|
|
|
|
|
=item ident_person ( TYPE | IDENTSTR | IDENTARRAY )
|
|
|
|
|
|
|
|
This suite of functions retrieves and parses ident information, as stored
|
|
|
|
in the commit and tag objects or produced by C<var GIT_type_IDENT> (thus
|
|
|
|
C<TYPE> can be either I<author> or I<committer>; case is insignificant).
|
|
|
|
|
2008-07-30 19:48:33 +02:00
|
|
|
The C<ident> method retrieves the ident information from C<git var>
|
2006-07-03 22:48:01 +02:00
|
|
|
and either returns it as a scalar string or as an array with the fields parsed.
|
|
|
|
Alternatively, it can take a prepared ident string (e.g. from the commit
|
|
|
|
object) and just parse it.
|
|
|
|
|
|
|
|
C<ident_person> returns the person part of the ident - name and email;
|
|
|
|
it can take the same arguments as C<ident> or the array returned by C<ident>.
|
|
|
|
|
|
|
|
The synopsis is like:
|
|
|
|
|
|
|
|
my ($name, $email, $time_tz) = ident('author');
|
|
|
|
"$name <$email>" eq ident_person('author');
|
|
|
|
"$name <$email>" eq ident_person($name);
|
|
|
|
$time_tz =~ /^\d+ [+-]\d{4}$/;
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub ident {
|
2008-03-14 18:29:29 +01:00
|
|
|
my ($self, $type) = _maybe_self(@_);
|
2006-07-03 22:48:01 +02:00
|
|
|
my $identstr;
|
|
|
|
if (lc $type eq lc 'committer' or lc $type eq lc 'author') {
|
2008-03-14 18:29:29 +01:00
|
|
|
my @cmd = ('var', 'GIT_'.uc($type).'_IDENT');
|
|
|
|
unshift @cmd, $self if $self;
|
|
|
|
$identstr = command_oneline(@cmd);
|
2006-07-03 22:48:01 +02:00
|
|
|
} else {
|
|
|
|
$identstr = $type;
|
|
|
|
}
|
|
|
|
if (wantarray) {
|
|
|
|
return $identstr =~ /^(.*) <(.*)> (\d+ [+-]\d{4})$/;
|
|
|
|
} else {
|
|
|
|
return $identstr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sub ident_person {
|
2008-03-14 18:29:29 +01:00
|
|
|
my ($self, @ident) = _maybe_self(@_);
|
|
|
|
$#ident == 0 and @ident = $self ? $self->ident($ident[0]) : ident($ident[0]);
|
2006-07-03 22:48:01 +02:00
|
|
|
return "$ident[0] <$ident[1]>";
|
|
|
|
}
|
|
|
|
|
2006-06-25 03:54:26 +02:00
|
|
|
=item hash_object ( TYPE, FILENAME )
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2008-06-01 22:26:25 +02:00
|
|
|
Compute the SHA1 object id of the given C<FILENAME> considering it is
|
|
|
|
of the C<TYPE> object type (C<blob>, C<commit>, C<tree>).
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
The method can be called without any instance or on a specified Git repository,
|
|
|
|
it makes zero difference.
|
|
|
|
|
|
|
|
The function returns the SHA1 hash.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
2006-09-23 20:20:47 +02:00
|
|
|
# TODO: Support for passing FILEHANDLE instead of FILENAME
|
2006-07-02 01:38:56 +02:00
|
|
|
sub hash_object {
|
|
|
|
my ($self, $type, $file) = _maybe_self(@_);
|
2006-09-23 20:20:47 +02:00
|
|
|
command_oneline('hash-object', '-t', $type, $file);
|
2006-07-02 01:38:56 +02:00
|
|
|
}
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
|
2008-05-23 16:19:40 +02:00
|
|
|
=item hash_and_insert_object ( FILENAME )
|
|
|
|
|
|
|
|
Compute the SHA1 object id of the given C<FILENAME> and add the object to the
|
|
|
|
object database.
|
|
|
|
|
|
|
|
The function returns the SHA1 hash.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
# TODO: Support for passing FILEHANDLE instead of FILENAME
|
|
|
|
sub hash_and_insert_object {
|
|
|
|
my ($self, $filename) = @_;
|
|
|
|
|
|
|
|
carp "Bad filename \"$filename\"" if $filename =~ /[\r\n]/;
|
|
|
|
|
|
|
|
$self->_open_hash_and_insert_object_if_needed();
|
|
|
|
my ($in, $out) = ($self->{hash_object_in}, $self->{hash_object_out});
|
|
|
|
|
|
|
|
unless (print $out $filename, "\n") {
|
|
|
|
$self->_close_hash_and_insert_object();
|
|
|
|
throw Error::Simple("out pipe went bad");
|
|
|
|
}
|
|
|
|
|
|
|
|
chomp(my $hash = <$in>);
|
|
|
|
unless (defined($hash)) {
|
|
|
|
$self->_close_hash_and_insert_object();
|
|
|
|
throw Error::Simple("in pipe went bad");
|
|
|
|
}
|
|
|
|
|
|
|
|
return $hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub _open_hash_and_insert_object_if_needed {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return if defined($self->{hash_object_pid});
|
|
|
|
|
|
|
|
($self->{hash_object_pid}, $self->{hash_object_in},
|
|
|
|
$self->{hash_object_out}, $self->{hash_object_ctx}) =
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
$self->command_bidi_pipe(qw(hash-object -w --stdin-paths --no-filters));
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
sub _close_hash_and_insert_object {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return unless defined($self->{hash_object_pid});
|
|
|
|
|
|
|
|
my @vars = map { 'hash_object_' . $_ } qw(pid in out ctx);
|
|
|
|
|
2008-08-04 07:02:47 +02:00
|
|
|
command_close_bidi_pipe(@$self{@vars});
|
|
|
|
delete @$self{@vars};
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
=item cat_blob ( SHA1, FILEHANDLE )
|
|
|
|
|
|
|
|
Prints the contents of the blob identified by C<SHA1> to C<FILEHANDLE> and
|
|
|
|
returns the number of bytes printed.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub cat_blob {
|
|
|
|
my ($self, $sha1, $fh) = @_;
|
|
|
|
|
|
|
|
$self->_open_cat_blob_if_needed();
|
|
|
|
my ($in, $out) = ($self->{cat_blob_in}, $self->{cat_blob_out});
|
|
|
|
|
|
|
|
unless (print $out $sha1, "\n") {
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
throw Error::Simple("out pipe went bad");
|
|
|
|
}
|
|
|
|
|
|
|
|
my $description = <$in>;
|
|
|
|
if ($description =~ / missing$/) {
|
|
|
|
carp "$sha1 doesn't exist in the repository";
|
2008-05-28 08:33:22 +02:00
|
|
|
return -1;
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
|
|
|
|
carp "Unexpected result returned from git cat-file";
|
2008-05-28 08:33:22 +02:00
|
|
|
return -1;
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
my $size = $1;
|
|
|
|
|
|
|
|
my $blob;
|
2013-02-22 22:01:18 +01:00
|
|
|
my $bytesLeft = $size;
|
2008-05-23 16:19:40 +02:00
|
|
|
|
|
|
|
while (1) {
|
|
|
|
last unless $bytesLeft;
|
|
|
|
|
|
|
|
my $bytesToRead = $bytesLeft < 1024 ? $bytesLeft : 1024;
|
2013-02-22 22:01:18 +01:00
|
|
|
my $read = read($in, $blob, $bytesToRead);
|
2008-05-23 16:19:40 +02:00
|
|
|
unless (defined($read)) {
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
throw Error::Simple("in pipe went bad");
|
|
|
|
}
|
2013-02-22 22:01:18 +01:00
|
|
|
unless (print $fh $blob) {
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
throw Error::Simple("couldn't write to passed in filehandle");
|
|
|
|
}
|
|
|
|
$bytesLeft -= $read;
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
# Skip past the trailing newline.
|
|
|
|
my $newline;
|
|
|
|
my $read = read($in, $newline, 1);
|
|
|
|
unless (defined($read)) {
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
throw Error::Simple("in pipe went bad");
|
|
|
|
}
|
|
|
|
unless ($read == 1 && $newline eq "\n") {
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
throw Error::Simple("didn't find newline after blob");
|
|
|
|
}
|
|
|
|
|
|
|
|
return $size;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub _open_cat_blob_if_needed {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return if defined($self->{cat_blob_pid});
|
|
|
|
|
|
|
|
($self->{cat_blob_pid}, $self->{cat_blob_in},
|
|
|
|
$self->{cat_blob_out}, $self->{cat_blob_ctx}) =
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
$self->command_bidi_pipe(qw(cat-file --batch));
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
sub _close_cat_blob {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return unless defined($self->{cat_blob_pid});
|
|
|
|
|
|
|
|
my @vars = map { 'cat_blob_' . $_ } qw(pid in out ctx);
|
|
|
|
|
2008-08-04 07:02:47 +02:00
|
|
|
command_close_bidi_pipe(@$self{@vars});
|
|
|
|
delete @$self{@vars};
|
2008-05-23 16:19:40 +02:00
|
|
|
}
|
2006-06-24 04:34:44 +02:00
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
|
2013-02-12 15:02:32 +01:00
|
|
|
=item credential_read( FILEHANDLE )
|
|
|
|
|
|
|
|
Reads credential key-value pairs from C<FILEHANDLE>. Reading stops at EOF or
|
|
|
|
when an empty line is encountered. Each line must be of the form C<key=value>
|
|
|
|
with a non-empty key. Function returns hash with all read values. Any white
|
|
|
|
space (other than new-line character) is preserved.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub credential_read {
|
|
|
|
my ($self, $reader) = _maybe_self(@_);
|
|
|
|
my %credential;
|
|
|
|
while (<$reader>) {
|
|
|
|
chomp;
|
|
|
|
if ($_ eq '') {
|
|
|
|
last;
|
|
|
|
} elsif (!/^([^=]+)=(.*)$/) {
|
|
|
|
throw Error::Simple("unable to parse git credential data:\n$_");
|
|
|
|
}
|
|
|
|
$credential{$1} = $2;
|
|
|
|
}
|
|
|
|
return %credential;
|
|
|
|
}
|
|
|
|
|
|
|
|
=item credential_write( FILEHANDLE, CREDENTIAL_HASHREF )
|
|
|
|
|
|
|
|
Writes credential key-value pairs from hash referenced by
|
|
|
|
C<CREDENTIAL_HASHREF> to C<FILEHANDLE>. Keys and values cannot contain
|
|
|
|
new-lines or NUL bytes characters, and key cannot contain equal signs nor be
|
|
|
|
empty (if they do Error::Simple is thrown). Any white space is preserved. If
|
|
|
|
value for a key is C<undef>, it will be skipped.
|
|
|
|
|
|
|
|
If C<'url'> key exists it will be written first. (All the other key-value
|
|
|
|
pairs are written in sorted order but you should not depend on that). Once
|
|
|
|
all lines are written, an empty line is printed.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub credential_write {
|
|
|
|
my ($self, $writer, $credential) = _maybe_self(@_);
|
|
|
|
my ($key, $value);
|
|
|
|
|
|
|
|
# Check if $credential is valid prior to writing anything
|
|
|
|
while (($key, $value) = each %$credential) {
|
|
|
|
if (!defined $key || !length $key) {
|
|
|
|
throw Error::Simple("credential key empty or undefined");
|
|
|
|
} elsif ($key =~ /[=\n\0]/) {
|
|
|
|
throw Error::Simple("credential key contains invalid characters: $key");
|
|
|
|
} elsif (defined $value && $value =~ /[\n\0]/) {
|
|
|
|
throw Error::Simple("credential value for key=$key contains invalid characters: $value");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for $key (sort {
|
|
|
|
# url overwrites other fields, so it must come first
|
|
|
|
return -1 if $a eq 'url';
|
|
|
|
return 1 if $b eq 'url';
|
|
|
|
return $a cmp $b;
|
|
|
|
} keys %$credential) {
|
|
|
|
if (defined $credential->{$key}) {
|
|
|
|
print $writer $key, '=', $credential->{$key}, "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print $writer "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub _credential_run {
|
|
|
|
my ($self, $credential, $op) = _maybe_self(@_);
|
|
|
|
my ($pid, $reader, $writer, $ctx) = command_bidi_pipe('credential', $op);
|
|
|
|
|
|
|
|
credential_write $writer, $credential;
|
|
|
|
close $writer;
|
|
|
|
|
|
|
|
if ($op eq "fill") {
|
|
|
|
%$credential = credential_read $reader;
|
|
|
|
}
|
|
|
|
if (<$reader>) {
|
|
|
|
throw Error::Simple("unexpected output from git credential $op response:\n$_\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
command_close_bidi_pipe($pid, $reader, undef, $ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
=item credential( CREDENTIAL_HASHREF [, OPERATION ] )
|
|
|
|
|
|
|
|
=item credential( CREDENTIAL_HASHREF, CODE )
|
|
|
|
|
|
|
|
Executes C<git credential> for a given set of credentials and specified
|
|
|
|
operation. In both forms C<CREDENTIAL_HASHREF> needs to be a reference to
|
|
|
|
a hash which stores credentials. Under certain conditions the hash can
|
|
|
|
change.
|
|
|
|
|
|
|
|
In the first form, C<OPERATION> can be C<'fill'>, C<'approve'> or C<'reject'>,
|
|
|
|
and function will execute corresponding C<git credential> sub-command. If
|
|
|
|
it's omitted C<'fill'> is assumed. In case of C<'fill'> the values stored in
|
|
|
|
C<CREDENTIAL_HASHREF> will be changed to the ones returned by the C<git
|
|
|
|
credential fill> command. The usual usage would look something like:
|
|
|
|
|
|
|
|
my %cred = (
|
|
|
|
'protocol' => 'https',
|
|
|
|
'host' => 'example.com',
|
|
|
|
'username' => 'bob'
|
|
|
|
);
|
|
|
|
Git::credential \%cred;
|
|
|
|
if (try_to_authenticate($cred{'username'}, $cred{'password'})) {
|
|
|
|
Git::credential \%cred, 'approve';
|
|
|
|
... do more stuff ...
|
|
|
|
} else {
|
|
|
|
Git::credential \%cred, 'reject';
|
|
|
|
}
|
|
|
|
|
|
|
|
In the second form, C<CODE> needs to be a reference to a subroutine. The
|
|
|
|
function will execute C<git credential fill> to fill the provided credential
|
|
|
|
hash, then call C<CODE> with C<CREDENTIAL_HASHREF> as the sole argument. If
|
|
|
|
C<CODE>'s return value is defined, the function will execute C<git credential
|
|
|
|
approve> (if return value yields true) or C<git credential reject> (if return
|
|
|
|
value is false). If the return value is undef, nothing at all is executed;
|
|
|
|
this is useful, for example, if the credential could neither be verified nor
|
|
|
|
rejected due to an unrelated network error. The return value is the same as
|
|
|
|
what C<CODE> returns. With this form, the usage might look as follows:
|
|
|
|
|
|
|
|
if (Git::credential {
|
|
|
|
'protocol' => 'https',
|
|
|
|
'host' => 'example.com',
|
|
|
|
'username' => 'bob'
|
|
|
|
}, sub {
|
|
|
|
my $cred = shift;
|
|
|
|
return !!try_to_authenticate($cred->{'username'},
|
|
|
|
$cred->{'password'});
|
|
|
|
}) {
|
|
|
|
... do more stuff ...
|
|
|
|
}
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub credential {
|
|
|
|
my ($self, $credential, $op_or_code) = (_maybe_self(@_), 'fill');
|
|
|
|
|
|
|
|
if ('CODE' eq ref $op_or_code) {
|
|
|
|
_credential_run $credential, 'fill';
|
|
|
|
my $ret = $op_or_code->($credential);
|
|
|
|
if (defined $ret) {
|
|
|
|
_credential_run $credential, $ret ? 'approve' : 'reject';
|
|
|
|
}
|
|
|
|
return $ret;
|
|
|
|
} else {
|
|
|
|
_credential_run $credential, $op_or_code;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
{ # %TEMP_* Lexical Context
|
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
my (%TEMP_FILEMAP, %TEMP_FILES);
|
2008-08-12 18:00:18 +02:00
|
|
|
|
|
|
|
=item temp_acquire ( NAME )
|
|
|
|
|
2013-04-12 00:36:10 +02:00
|
|
|
Attempts to retrieve the temporary file mapped to the string C<NAME>. If an
|
2008-08-12 18:00:18 +02:00
|
|
|
associated temp file has not been created this session or was closed, it is
|
|
|
|
created, cached, and set for autoflush and binmode.
|
|
|
|
|
|
|
|
Internally locks the file mapped to C<NAME>. This lock must be released with
|
|
|
|
C<temp_release()> when the temp file is no longer needed. Subsequent attempts
|
|
|
|
to retrieve temporary files mapped to the same C<NAME> while still locked will
|
|
|
|
cause an error. This locking mechanism provides a weak guarantee and is not
|
|
|
|
threadsafe. It does provide some error checking to help prevent temp file refs
|
|
|
|
writing over one another.
|
|
|
|
|
|
|
|
In general, the L<File::Handle> returned should not be closed by consumers as
|
|
|
|
it defeats the purpose of this caching mechanism. If you need to close the temp
|
|
|
|
file handle, then you should use L<File::Temp> or another temp file faculty
|
|
|
|
directly. If a handle is closed and then requested again, then a warning will
|
|
|
|
issue.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub temp_acquire {
|
2008-11-13 13:04:09 +01:00
|
|
|
my $temp_fd = _temp_cache(@_);
|
2008-08-12 18:00:18 +02:00
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
$TEMP_FILES{$temp_fd}{locked} = 1;
|
2008-08-12 18:00:18 +02:00
|
|
|
$temp_fd;
|
|
|
|
}
|
|
|
|
|
2013-07-07 06:20:48 +02:00
|
|
|
=item temp_is_locked ( NAME )
|
|
|
|
|
|
|
|
Returns true if the internal lock created by a previous C<temp_acquire()>
|
|
|
|
call with C<NAME> is still in effect.
|
|
|
|
|
|
|
|
When temp_acquire is called on a C<NAME>, it internally locks the temporary
|
|
|
|
file mapped to C<NAME>. That lock will not be released until C<temp_release()>
|
|
|
|
is called with either the original C<NAME> or the L<File::Handle> that was
|
|
|
|
returned from the original call to temp_acquire.
|
|
|
|
|
|
|
|
Subsequent attempts to call C<temp_acquire()> with the same C<NAME> will fail
|
|
|
|
unless there has been an intervening C<temp_release()> call for that C<NAME>
|
|
|
|
(or its corresponding L<File::Handle> that was returned by the original
|
|
|
|
C<temp_acquire()> call).
|
|
|
|
|
|
|
|
If true is returned by C<temp_is_locked()> for a C<NAME>, an attempt to
|
|
|
|
C<temp_acquire()> the same C<NAME> will cause an error unless
|
|
|
|
C<temp_release> is first called on that C<NAME> (or its corresponding
|
|
|
|
L<File::Handle> that was returned by the original C<temp_acquire()> call).
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub temp_is_locked {
|
|
|
|
my ($self, $name) = _maybe_self(@_);
|
|
|
|
my $temp_fd = \$TEMP_FILEMAP{$name};
|
|
|
|
|
|
|
|
defined $$temp_fd && $$temp_fd->opened && $TEMP_FILES{$$temp_fd}{locked};
|
|
|
|
}
|
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
=item temp_release ( NAME )
|
|
|
|
|
|
|
|
=item temp_release ( FILEHANDLE )
|
|
|
|
|
|
|
|
Releases a lock acquired through C<temp_acquire()>. Can be called either with
|
|
|
|
the C<NAME> mapping used when acquiring the temp file or with the C<FILEHANDLE>
|
|
|
|
referencing a locked temp file.
|
|
|
|
|
|
|
|
Warns if an attempt is made to release a file that is not locked.
|
|
|
|
|
|
|
|
The temp file will be truncated before being released. This can help to reduce
|
|
|
|
disk I/O where the system is smart enough to detect the truncation while data
|
|
|
|
is in the output buffers. Beware that after the temp file is released and
|
|
|
|
truncated, any operations on that file may fail miserably until it is
|
|
|
|
re-acquired. All contents are lost between each release and acquire mapped to
|
|
|
|
the same string.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub temp_release {
|
|
|
|
my ($self, $temp_fd, $trunc) = _maybe_self(@_);
|
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
if (exists $TEMP_FILEMAP{$temp_fd}) {
|
2008-08-12 18:00:18 +02:00
|
|
|
$temp_fd = $TEMP_FILES{$temp_fd};
|
|
|
|
}
|
2008-09-08 18:53:01 +02:00
|
|
|
unless ($TEMP_FILES{$temp_fd}{locked}) {
|
2008-08-12 18:00:18 +02:00
|
|
|
carp "Attempt to release temp file '",
|
|
|
|
$temp_fd, "' that has not been locked";
|
|
|
|
}
|
|
|
|
temp_reset($temp_fd) if $trunc and $temp_fd->opened;
|
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
$TEMP_FILES{$temp_fd}{locked} = 0;
|
2008-08-12 18:00:18 +02:00
|
|
|
undef;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub _temp_cache {
|
2008-11-13 13:04:09 +01:00
|
|
|
my ($self, $name) = _maybe_self(@_);
|
2008-08-12 18:00:18 +02:00
|
|
|
|
2008-08-15 21:53:59 +02:00
|
|
|
_verify_require();
|
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
my $temp_fd = \$TEMP_FILEMAP{$name};
|
2008-08-12 18:00:18 +02:00
|
|
|
if (defined $$temp_fd and $$temp_fd->opened) {
|
2013-07-19 02:16:16 +02:00
|
|
|
if ($TEMP_FILES{$$temp_fd}{locked}) {
|
2009-01-13 23:41:35 +01:00
|
|
|
throw Error::Simple("Temp file with moniker '" .
|
|
|
|
$name . "' already in use");
|
2008-08-12 18:00:18 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (defined $$temp_fd) {
|
|
|
|
# then we're here because of a closed handle.
|
|
|
|
carp "Temp file '", $name,
|
|
|
|
"' was closed. Opening replacement.";
|
|
|
|
}
|
2008-09-08 18:53:01 +02:00
|
|
|
my $fname;
|
2008-11-13 13:04:09 +01:00
|
|
|
|
|
|
|
my $tmpdir;
|
|
|
|
if (defined $self) {
|
|
|
|
$tmpdir = $self->repo_path();
|
|
|
|
}
|
|
|
|
|
2014-10-29 20:31:55 +01:00
|
|
|
my $n = $name;
|
|
|
|
$n =~ s/\W/_/g; # no strange chars
|
|
|
|
|
2013-04-29 10:09:57 +02:00
|
|
|
($$temp_fd, $fname) = File::Temp::tempfile(
|
2014-10-29 20:31:55 +01:00
|
|
|
"Git_${n}_XXXXXX", UNLINK => 1, DIR => $tmpdir,
|
2008-08-12 18:00:18 +02:00
|
|
|
) or throw Error::Simple("couldn't open new temp file");
|
2008-11-13 13:04:09 +01:00
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
$$temp_fd->autoflush;
|
|
|
|
binmode $$temp_fd;
|
2008-09-08 18:53:01 +02:00
|
|
|
$TEMP_FILES{$$temp_fd}{fname} = $fname;
|
2008-08-12 18:00:18 +02:00
|
|
|
}
|
|
|
|
$$temp_fd;
|
|
|
|
}
|
|
|
|
|
2008-08-15 21:53:59 +02:00
|
|
|
sub _verify_require {
|
|
|
|
eval { require File::Temp; require File::Spec; };
|
|
|
|
$@ and throw Error::Simple($@);
|
|
|
|
}
|
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
=item temp_reset ( FILEHANDLE )
|
|
|
|
|
|
|
|
Truncates and resets the position of the C<FILEHANDLE>.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub temp_reset {
|
|
|
|
my ($self, $temp_fd) = _maybe_self(@_);
|
|
|
|
|
|
|
|
truncate $temp_fd, 0
|
|
|
|
or throw Error::Simple("couldn't truncate file");
|
|
|
|
sysseek($temp_fd, 0, SEEK_SET) and seek($temp_fd, 0, SEEK_SET)
|
|
|
|
or throw Error::Simple("couldn't seek to beginning of file");
|
|
|
|
sysseek($temp_fd, 0, SEEK_CUR) == 0 and tell($temp_fd) == 0
|
|
|
|
or throw Error::Simple("expected file position to be reset");
|
|
|
|
}
|
|
|
|
|
2008-09-08 18:53:01 +02:00
|
|
|
=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};
|
|
|
|
}
|
|
|
|
|
2008-08-12 18:00:18 +02:00
|
|
|
sub END {
|
2008-09-08 18:53:01 +02:00
|
|
|
unlink values %TEMP_FILEMAP if %TEMP_FILEMAP;
|
2008-08-12 18:00:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
} # %TEMP_* Lexical Context
|
|
|
|
|
2016-12-14 13:54:24 +01:00
|
|
|
=item prefix_lines ( PREFIX, STRING [, STRING... ])
|
|
|
|
|
|
|
|
Prefixes lines in C<STRING> with C<PREFIX>.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub prefix_lines {
|
|
|
|
my $prefix = shift;
|
|
|
|
my $string = join("\n", @_);
|
|
|
|
$string =~ s/^/$prefix/mg;
|
|
|
|
return $string;
|
|
|
|
}
|
|
|
|
|
2017-06-30 11:49:09 +02:00
|
|
|
=item unquote_path ( PATH )
|
|
|
|
|
|
|
|
Unquote a quoted path containing c-escapes as returned by ls-files etc.
|
|
|
|
when not using -z or when parsing the output of diff -u.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
{
|
|
|
|
my %cquote_map = (
|
2017-06-30 11:49:10 +02:00
|
|
|
"a" => chr(7),
|
2017-06-30 11:49:09 +02:00
|
|
|
"b" => chr(8),
|
|
|
|
"t" => chr(9),
|
|
|
|
"n" => chr(10),
|
|
|
|
"v" => chr(11),
|
|
|
|
"f" => chr(12),
|
|
|
|
"r" => chr(13),
|
|
|
|
"\\" => "\\",
|
|
|
|
"\042" => "\042",
|
|
|
|
);
|
|
|
|
|
|
|
|
sub unquote_path {
|
|
|
|
local ($_) = @_;
|
|
|
|
my ($retval, $remainder);
|
|
|
|
if (!/^\042(.*)\042$/) {
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
($_, $retval) = ($1, "");
|
|
|
|
while (/^([^\\]*)\\(.*)$/) {
|
|
|
|
$remainder = $2;
|
|
|
|
$retval .= $1;
|
|
|
|
for ($remainder) {
|
|
|
|
if (/^([0-3][0-7][0-7])(.*)$/) {
|
|
|
|
$retval .= chr(oct($1));
|
|
|
|
$_ = $2;
|
|
|
|
last;
|
|
|
|
}
|
2017-06-30 11:49:10 +02:00
|
|
|
if (/^([\\\042abtnvfr])(.*)$/) {
|
2017-06-30 11:49:09 +02:00
|
|
|
$retval .= $cquote_map{$1};
|
|
|
|
$_ = $2;
|
|
|
|
last;
|
|
|
|
}
|
2017-06-30 11:49:11 +02:00
|
|
|
# This is malformed
|
|
|
|
throw Error::Simple("invalid quoted path $_[0]");
|
2017-06-30 11:49:09 +02:00
|
|
|
}
|
|
|
|
$_ = $remainder;
|
|
|
|
}
|
|
|
|
$retval .= $_;
|
|
|
|
return $retval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-14 13:54:24 +01:00
|
|
|
=item get_comment_line_char ( )
|
|
|
|
|
|
|
|
Gets the core.commentchar configuration value.
|
|
|
|
The value falls-back to '#' if core.commentchar is set to 'auto'.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub get_comment_line_char {
|
|
|
|
my $comment_line_char = config("core.commentchar") || '#';
|
|
|
|
$comment_line_char = '#' if ($comment_line_char eq 'auto');
|
|
|
|
$comment_line_char = '#' if (length($comment_line_char) != 1);
|
|
|
|
return $comment_line_char;
|
|
|
|
}
|
|
|
|
|
|
|
|
=item comment_lines ( STRING [, STRING... ])
|
|
|
|
|
|
|
|
Comments lines following core.commentchar configuration.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub comment_lines {
|
|
|
|
my $comment_line_char = get_comment_line_char;
|
|
|
|
return prefix_lines("$comment_line_char ", @_);
|
|
|
|
}
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
=back
|
|
|
|
|
2006-06-24 04:34:42 +02:00
|
|
|
=head1 ERROR HANDLING
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
2006-06-24 04:34:42 +02:00
|
|
|
All functions are supposed to throw Perl exceptions in case of errors.
|
2006-06-24 04:34:44 +02:00
|
|
|
See the L<Error> module on how to catch those. Most exceptions are mere
|
|
|
|
L<Error::Simple> instances.
|
|
|
|
|
|
|
|
However, the C<command()>, C<command_oneline()> and C<command_noisy()>
|
|
|
|
functions suite can throw C<Git::Error::Command> exceptions as well: those are
|
|
|
|
thrown when the external command returns an error code and contain the error
|
|
|
|
code as well as access to the captured command's output. The exception class
|
|
|
|
provides the usual C<stringify> and C<value> (command's exit code) methods and
|
|
|
|
in addition also a C<cmd_output> method that returns either an array or a
|
|
|
|
string with the captured command output (depending on the original function
|
|
|
|
call context; C<command_noisy()> returns C<undef>) and $<cmdline> which
|
|
|
|
returns the command and its arguments (but without proper quoting).
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
Note that the C<command_*_pipe()> functions cannot throw this exception since
|
2006-06-24 04:34:44 +02:00
|
|
|
it has no idea whether the command failed or not. You will only find out
|
|
|
|
at the time you C<close> the pipe; if you want to have that automated,
|
|
|
|
use C<command_close_pipe()>, which can throw the exception.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
{
|
|
|
|
package Git::Error::Command;
|
|
|
|
|
|
|
|
@Git::Error::Command::ISA = qw(Error);
|
|
|
|
|
|
|
|
sub new {
|
|
|
|
my $self = shift;
|
|
|
|
my $cmdline = '' . shift;
|
|
|
|
my $value = 0 + shift;
|
|
|
|
my $outputref = shift;
|
|
|
|
my(@args) = ();
|
|
|
|
|
|
|
|
local $Error::Depth = $Error::Depth + 1;
|
|
|
|
|
|
|
|
push(@args, '-cmdline', $cmdline);
|
|
|
|
push(@args, '-value', $value);
|
|
|
|
push(@args, '-outputref', $outputref);
|
|
|
|
|
|
|
|
$self->SUPER::new(-text => 'command returned error', @args);
|
|
|
|
}
|
|
|
|
|
|
|
|
sub stringify {
|
|
|
|
my $self = shift;
|
|
|
|
my $text = $self->SUPER::stringify;
|
|
|
|
$self->cmdline() . ': ' . $text . ': ' . $self->value() . "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub cmdline {
|
|
|
|
my $self = shift;
|
|
|
|
$self->{'-cmdline'};
|
|
|
|
}
|
|
|
|
|
|
|
|
sub cmd_output {
|
|
|
|
my $self = shift;
|
|
|
|
my $ref = $self->{'-outputref'};
|
|
|
|
defined $ref or undef;
|
|
|
|
if (ref $ref eq 'ARRAY') {
|
|
|
|
return @$ref;
|
|
|
|
} else { # SCALAR
|
|
|
|
return $$ref;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
=over 4
|
|
|
|
|
|
|
|
=item git_cmd_try { CODE } ERRMSG
|
|
|
|
|
|
|
|
This magical statement will automatically catch any C<Git::Error::Command>
|
|
|
|
exceptions thrown by C<CODE> and make your program die with C<ERRMSG>
|
|
|
|
on its lips; the message will have %s substituted for the command line
|
|
|
|
and %d for the exit status. This statement is useful mostly for producing
|
|
|
|
more user-friendly error messages.
|
|
|
|
|
|
|
|
In case of no exception caught the statement returns C<CODE>'s return value.
|
|
|
|
|
|
|
|
Note that this is the only auto-exported function.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
sub git_cmd_try(&$) {
|
|
|
|
my ($code, $errmsg) = @_;
|
|
|
|
my @result;
|
|
|
|
my $err;
|
|
|
|
my $array = wantarray;
|
|
|
|
try {
|
|
|
|
if ($array) {
|
|
|
|
@result = &$code;
|
|
|
|
} else {
|
|
|
|
$result[0] = &$code;
|
|
|
|
}
|
|
|
|
} catch Git::Error::Command with {
|
|
|
|
my $E = shift;
|
|
|
|
$err = $errmsg;
|
|
|
|
$err =~ s/\%s/$E->cmdline()/ge;
|
|
|
|
$err =~ s/\%d/$E->value()/ge;
|
|
|
|
# We can't croak here since Error.pm would mangle
|
|
|
|
# that to Error::Simple.
|
|
|
|
};
|
|
|
|
$err and croak $err;
|
|
|
|
return $array ? @result : $result[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
=back
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
=head1 COPYRIGHT
|
|
|
|
|
|
|
|
Copyright 2006 by Petr Baudis E<lt>pasky@suse.czE<gt>.
|
|
|
|
|
|
|
|
This module is free software; it may be used, copied, modified
|
|
|
|
and distributed under the terms of the GNU General Public Licence,
|
|
|
|
either version 2, or (at your option) any later version.
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
|
|
|
|
# Take raw method argument list and return ($obj, @args) in case
|
|
|
|
# the method was called upon an instance and (undef, @args) if
|
|
|
|
# it was called directly.
|
|
|
|
sub _maybe_self {
|
2008-10-18 20:25:12 +02:00
|
|
|
UNIVERSAL::isa($_[0], 'Git') ? @_ : (undef, @_);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
|
2006-06-24 04:34:47 +02:00
|
|
|
# Check if the command id is something reasonable.
|
|
|
|
sub _check_valid_cmd {
|
|
|
|
my ($cmd) = @_;
|
|
|
|
$cmd =~ /^[a-z0-9A-Z_-]+$/ or throw Error::Simple("bad command: $cmd");
|
|
|
|
}
|
|
|
|
|
|
|
|
# Common backend for the pipe creators.
|
|
|
|
sub _command_common_pipe {
|
|
|
|
my $direction = shift;
|
2006-06-24 04:34:49 +02:00
|
|
|
my ($self, @p) = _maybe_self(@_);
|
|
|
|
my (%opts, $cmd, @args);
|
|
|
|
if (ref $p[0]) {
|
|
|
|
($cmd, @args) = @{shift @p};
|
|
|
|
%opts = ref $p[0] ? %{$p[0]} : @p;
|
|
|
|
} else {
|
|
|
|
($cmd, @args) = @p;
|
|
|
|
}
|
2006-06-24 04:34:47 +02:00
|
|
|
_check_valid_cmd($cmd);
|
|
|
|
|
2006-06-25 03:54:23 +02:00
|
|
|
my $fh;
|
2007-01-22 17:14:56 +01:00
|
|
|
if ($^O eq 'MSWin32') {
|
2006-06-25 03:54:23 +02:00
|
|
|
# ActiveState Perl
|
|
|
|
#defined $opts{STDERR} and
|
|
|
|
# warn 'ignoring STDERR option - running w/ ActiveState';
|
|
|
|
$direction eq '-|' or
|
|
|
|
die 'input pipe for ActiveState not implemented';
|
2007-01-22 17:16:05 +01:00
|
|
|
# the strange construction with *ACPIPE is just to
|
|
|
|
# explain the tie below that we want to bind to
|
|
|
|
# a handle class, not scalar. It is not known if
|
|
|
|
# it is something specific to ActiveState Perl or
|
|
|
|
# just a Perl quirk.
|
|
|
|
tie (*ACPIPE, 'Git::activestate_pipe', $cmd, @args);
|
|
|
|
$fh = *ACPIPE;
|
2006-06-25 03:54:23 +02:00
|
|
|
|
|
|
|
} else {
|
|
|
|
my $pid = open($fh, $direction);
|
|
|
|
if (not defined $pid) {
|
|
|
|
throw Error::Simple("open failed: $!");
|
|
|
|
} elsif ($pid == 0) {
|
|
|
|
if ($opts{STDERR}) {
|
|
|
|
open (STDERR, '>&', $opts{STDERR})
|
|
|
|
or die "dup failed: $!";
|
2013-04-04 22:41:41 +02:00
|
|
|
} elsif (defined $opts{STDERR}) {
|
|
|
|
open (STDERR, '>', '/dev/null')
|
|
|
|
or die "opening /dev/null failed: $!";
|
2006-06-25 03:54:23 +02:00
|
|
|
}
|
|
|
|
_cmd_exec($self, $cmd, @args);
|
2006-06-24 04:34:49 +02:00
|
|
|
}
|
2006-06-24 04:34:47 +02:00
|
|
|
}
|
|
|
|
return wantarray ? ($fh, join(' ', $cmd, @args)) : $fh;
|
|
|
|
}
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
# When already in the subprocess, set up the appropriate state
|
|
|
|
# for the given repository and execute the git command.
|
|
|
|
sub _cmd_exec {
|
|
|
|
my ($self, @args) = @_;
|
perl: command_bidi_pipe() method should set-up git environmens
When command_input_pipe and command_output_pipe are used as a
method of a Git::repository instance, they eventually call into
_cmd_exec method that sets up the execution environment such as
GIT_DIR, GIT_WORK_TREE environment variables and the current
working directory in the child process that interacts with the
repository.
command_bidi_pipe however didn't expect to be called as such, and
lacked all these set-up. Because of this, a program that did this
did not work as expected:
my $repo = Git->repository(Directory => '/some/where/else');
my ($pid, $in, $out, $ctx) =
$repo->command_bidi_pipe(qw(hash-object -w --stdin-paths));
This patch refactors the _cmd_exec into _setup_git_cmd_env that
sets up the execution environment, and makes _cmd_exec and
command_bidi_pipe to use it.
Note that unlike _cmd_exec that execv's a git command as an
external process, command_bidi_pipe is called from the main line
of control, and the execution environment needs to be restored
after open2() does its magic.
Signed-off-by: Masatake Osanai <unpush@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14 23:13:04 +01:00
|
|
|
_setup_git_cmd_env($self);
|
|
|
|
_execv_git_cmd(@args);
|
|
|
|
die qq[exec "@args" failed: $!];
|
|
|
|
}
|
|
|
|
|
|
|
|
# set up the appropriate state for git command
|
|
|
|
sub _setup_git_cmd_env {
|
|
|
|
my $self = shift;
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
if ($self) {
|
2006-06-24 04:34:51 +02:00
|
|
|
$self->repo_path() and $ENV{'GIT_DIR'} = $self->repo_path();
|
2009-05-07 15:41:27 +02:00
|
|
|
$self->repo_path() and $self->wc_path()
|
|
|
|
and $ENV{'GIT_WORK_TREE'} = $self->wc_path();
|
2006-06-24 04:34:51 +02:00
|
|
|
$self->wc_path() and chdir($self->wc_path());
|
|
|
|
$self->wc_subdir() and chdir($self->wc_subdir());
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-24 04:34:34 +02:00
|
|
|
# Execute the given Git command ($_[0]) with arguments ($_[1..])
|
|
|
|
# by searching for it at proper places.
|
2006-09-23 20:20:47 +02:00
|
|
|
sub _execv_git_cmd { exec('git', @_); }
|
2006-06-24 04:34:34 +02:00
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
# Close pipe to a subprocess.
|
|
|
|
sub _cmd_close {
|
2013-02-12 15:02:30 +01:00
|
|
|
my $ctx = shift @_;
|
|
|
|
foreach my $fh (@_) {
|
|
|
|
if (close $fh) {
|
|
|
|
# nop
|
|
|
|
} elsif ($!) {
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
# It's just close, no point in fatalities
|
|
|
|
carp "error closing pipe: $!";
|
|
|
|
} elsif ($? >> 8) {
|
2006-06-24 04:34:44 +02:00
|
|
|
# The caller should pepper this.
|
|
|
|
throw Git::Error::Command($ctx, $? >> 8);
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
}
|
|
|
|
# else we might e.g. closed a live stream; the command
|
|
|
|
# dying of SIGPIPE would drive us here.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-05-23 16:19:40 +02:00
|
|
|
sub DESTROY {
|
|
|
|
my ($self) = @_;
|
|
|
|
$self->_close_hash_and_insert_object();
|
|
|
|
$self->_close_cat_blob();
|
|
|
|
}
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
|
|
|
|
|
2006-06-25 03:54:23 +02:00
|
|
|
# Pipe implementation for ActiveState Perl.
|
|
|
|
|
|
|
|
package Git::activestate_pipe;
|
|
|
|
use strict;
|
|
|
|
|
|
|
|
sub TIEHANDLE {
|
|
|
|
my ($class, @params) = @_;
|
|
|
|
# FIXME: This is probably horrible idea and the thing will explode
|
|
|
|
# at the moment you give it arguments that require some quoting,
|
|
|
|
# but I have no ActiveState clue... --pasky
|
2007-01-22 17:14:56 +01:00
|
|
|
# Let's just hope ActiveState Perl does at least the quoting
|
|
|
|
# correctly.
|
|
|
|
my @data = qx{git @params};
|
2006-06-25 03:54:23 +02:00
|
|
|
bless { i => 0, data => \@data }, $class;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub READLINE {
|
|
|
|
my $self = shift;
|
|
|
|
if ($self->{i} >= scalar @{$self->{data}}) {
|
|
|
|
return undef;
|
|
|
|
}
|
2007-08-22 18:13:07 +02:00
|
|
|
my $i = $self->{i};
|
|
|
|
if (wantarray) {
|
|
|
|
$self->{i} = $#{$self->{'data'}} + 1;
|
|
|
|
return splice(@{$self->{'data'}}, $i);
|
|
|
|
}
|
|
|
|
$self->{i} = $i + 1;
|
|
|
|
return $self->{'data'}->[ $i ];
|
2006-06-25 03:54:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
sub CLOSE {
|
|
|
|
my $self = shift;
|
|
|
|
delete $self->{data};
|
|
|
|
delete $self->{i};
|
|
|
|
}
|
|
|
|
|
|
|
|
sub EOF {
|
|
|
|
my $self = shift;
|
|
|
|
return ($self->{i} >= scalar @{$self->{data}});
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 04:34:29 +02:00
|
|
|
1; # Famous last words
|