our $SHA1RE = qr/[0-9a-fA-F]{40}/;
around BUILDARGS (ClassName $class: Dir $dir) {
+ # Allows us to be called as Project->new($dir)
+ # Last path component becomes $self->name
+ # Full path to git objects becomes $self->path
my $name = $dir->dir_list(-1);
$dir = $dir->subdir('.git') if (-f $dir->file('.git', 'HEAD'));
confess("Can't find a git repository at " . $dir)
=head2 name
-=cut
+The name of the Project. By default, this is derived from the path to the git repository.
+=cut
has name => ( isa => NonEmptySimpleStr,
is => 'ro', required => 1 );
L<Path::Class:Dir> for the location of the git repository.
=cut
-
has path => ( isa => Dir,
is => 'ro', required => 1);
String containing .git/description
=cut
-
has description => ( isa => Str,
is => 'ro',
lazy_build => 1,
Owner of the files on disk.
=cut
-
has owner => ( isa => NonEmptySimpleStr,
is => 'ro',
lazy_build => 1,
undef if the repository has never been used.
=cut
-
has last_change => ( isa => Maybe['DateTime'],
is => 'ro',
lazy_build => 1,
Bool indicating whether this Project is bare.
=cut
-
has is_bare => ( isa => Bool,
is => 'ro',
lazy => 1,
},
);
+=head2 heads
+
+ArrayRef of hashes containing the name and sha1 of all heads.
+
+=cut
+ has heads => ( isa => ArrayRef[HashRef],
+ is => 'ro',
+ lazy_build => 1);
+
+=head2 references
+
+Hashref of ArrayRefs for each reference.
+
+=cut
+ has references => ( isa => HashRef[ArrayRef[Str]],
+ is => 'ro',
+ lazy_build => 1 );
+
method BUILD {
$self->$_() for qw/last_change owner description/; # Ensure to build early.
}
=head1 METHODS
-=head2 head_hash
+=head2 head_hash ($head?)
Return the sha1 for HEAD, or any specified head.
=cut
-
method head_hash (Str $head?) {
my $output = $self->run_cmd(qw/rev-parse --verify/, $head || 'HEAD' );
confess("No such head: " . $head) unless defined $output;
return $sha1;
}
-
-=head2 heads
-
-ArrayRef of hashes containing the name and sha1 of all heads.
-
-=cut
-
- has heads => ( isa => ArrayRef[HashRef], is => 'ro', lazy_build => 1);
-
- method _build_heads {
- my @revlines = $self->run_cmd_list(qw/for-each-ref --sort=-committerdate /, '--format=%(objectname)%00%(refname)%00%(committer)', 'refs/heads');
- my @ret;
- for my $line (@revlines) {
- my ($rev, $head, $commiter) = split /\0/, $line, 3;
- $head =~ s!^refs/heads/!!;
-
- push @ret, { sha1 => $rev, name => $head };
-
- #FIXME: That isn't the time I'm looking for..
- if (my ($epoch, $tz) = $line =~ /\s(\d+)\s+([+-]\d+)$/) {
- my $dt = DateTime->from_epoch(epoch => $epoch);
- $dt->set_time_zone($tz);
- $ret[-1]->{last_change} = $dt;
- }
- }
-
- return \@ret;
- }
-
-=head2 references
-
-Hashref of ArrayRefs for each reference.
-
-=cut
-
- has references => ( isa => HashRef[ArrayRef[Str]], is => 'ro', lazy_build => 1 );
-
- method _build_references {
- # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
- # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
- my @reflist = $self->run_cmd_list(qw(show-ref --dereference))
- or return;
- my %refs;
- for(@reflist) {
- push @{$refs{$1}}, $2
- if m!^($SHA1RE)\srefs/(.*)$!;
- }
-
- return \%refs;
- }
-
-=head2 list_tree
+=head2 list_tree ($sha1?)
Return an array of contents for a given tree.
The tree is specified by sha1, and defaults to HEAD.
-The keys for each item will be:
-
- mode
- type
- object
- file
+Each item is a L<Gitalist::Git::Object>.
=cut
-
method list_tree (Str $sha1?) {
$sha1 ||= $self->head_hash;
return @ret;
}
+=head2 get_object ($sha1)
+
+Return a L<Gitalist::Git::Object> for the given sha1.
+
+=cut
method get_object (NonEmptySimpleStr $sha1) {
unless ( $self->_is_valid_rev($sha1) ) {
$sha1 = $self->head_hash($sha1);
);
}
- method _is_valid_rev (Str $rev) {
- return ($rev =~ /^($SHA1RE)$/);
- }
+=head2 hash_by_path($sha1, $path, $type?)
+
+Returns the sha1 for a given path, optionally limited by type.
+=cut
method hash_by_path ($base, $path = '', $type?) {
$path =~ s{/+$}();
# FIXME should this really just take the first result?
: $3;
}
+=head2 list_revs($sha1, $count?, $skip?, \%search?, $file?)
+
+Returns a list of revs for the given head ($sha1).
+
+=cut
method list_revs ( NonEmptySimpleStr :$sha1!,
Int :$count?,
Int :$skip?,
HashRef :$search?,
- NonEmptySimpleStr :$file?
- ) {
+ NonEmptySimpleStr :$file? ) {
$sha1 = $self->head_hash($sha1)
if !$sha1 || $sha1 !~ $SHA1RE;
my @search_opts;
- if($search) {
+ if ($search) {
$search->{type} = 'grep'
if $search->{type} eq 'commit';
@search_opts = (
);
return unless $output;
- my @revs = $self->parse_rev_list($output);
+ my @revs = $self->_parse_rev_list($output);
return @revs;
}
- method parse_rev_list ($output) {
- return
- map $self->get_gpp_object($_),
- grep $self->_is_valid_rev($_),
- map split(/\n/, $_, 6), split /\0/, $output;
- }
-
- # XXX Ideally this would return a wee object instead of ad hoc structures.
- method diff ( Gitalist::Git::Object :$commit,
- Bool :$patch?,
- Maybe[NonEmptySimpleStr] :$parent?,
- NonEmptySimpleStr :$file? ) {
- # Use parent if specifed, else take the parent from the commit
- # if there is only one, otherwise it was a merge commit.
- $parent = $parent
- ? $parent
- : $commit->parents <= 1
- ? $commit->parent_sha1
- : '-c';
- my @etc = (
- ( $file ? ('--', $file) : () ),
- );
-
- my @out = $self->raw_diff(
- ( $patch ? '--patch-with-raw' : () ),
- ( $parent ? $parent : () ),
- $commit->sha1, @etc,
- );
-
- # XXX Yes, there is much wrongness having parse_diff_tree be destructive.
- my @difftree = $self->parse_diff_tree(\@out);
-
- return \@difftree
- unless $patch;
-
- # The blank line between the tree and the patch.
- shift @out;
-
- # XXX And no I'm not happy about having diff return tree + patch.
- return \@difftree, [$self->parse_diff(@out)];
- }
-
- method parse_diff (@diff) {
- my @ret;
- for (@diff) {
- # This regex is a little pathological.
- if(m{^diff --git (a/(.*?)) (b/\2)}) {
- push @ret, {
- head => $_,
- a => $1,
- b => $3,
- file => $2,
- diff => '',
- };
- next;
- }
+=head2 diff($commit, $patch?, $parent?, $file?)
- if(/^index (\w+)\.\.(\w+) (\d+)$/) {
- @{$ret[-1]}{qw(index src dst mode)} = ($_, $1, $2, $3);
- next
- }
+Generate a diff from a given L<Gitalist::Git::Object>.
- # XXX Somewhat hacky. Ahem.
- $ret[@ret ? -1 : 0]{diff} .= "$_\n";
- }
+=cut
- return @ret;
+ method diff ( Gitalist::Git::Object :$commit!,
+ Bool :$patch?,
+ Maybe[NonEmptySimpleStr] :$parent?,
+ NonEmptySimpleStr :$file?
+ ) {
+ return $commit->diff( patch => $patch,
+ parent => $parent,
+ file => $file);
}
- # gitweb uses the following sort of command for diffing merges:
-# /home/dbrook/apps/bin/git --git-dir=/home/dbrook/dev/app/.git diff-tree -r -M --no-commit-id --patch-with-raw --full-index --cc 316cf158df3f6207afbae7270bcc5ba0 --
-# and for regular diffs
-# /home/dbrook/apps/bin/git --git-dir=/home/dbrook/dev/app/.git diff-tree -r -M --no-commit-id --patch-with-raw --full-index 2e3454ca0749641b42f063730b0090e1 316cf158df3f6207afbae7270bcc5ba0 --
-
- method raw_diff (@args) {
- return $self->run_cmd_list(
- qw(diff-tree -r -M --no-commit-id --full-index),
- @args
- );
- }
+=head2 reflog(@lorgargs)
- method parse_diff_tree ($diff) {
- my @keys = qw(modesrc modedst sha1src sha1dst status src dst);
- my @ret;
- while (@$diff and $diff->[0] =~ /^:\d+/) {
- my $line = shift @$diff;
- # see. man git-diff-tree for more info
- # mode src, mode dst, sha1 src, sha1 dst, status, src[, dst]
- my @vals = $line =~ /^:(\d+) (\d+) ($SHA1RE) ($SHA1RE) ([ACDMRTUX]\d*)\t([^\t]+)(?:\t([^\n]+))?$/;
- my %line = zip @keys, @vals;
- # Some convenience keys
- $line{file} = $line{src};
- $line{sha1} = $line{sha1dst};
- $line{is_new} = $line{sha1src} =~ /^0+$/
- if $line{sha1src};
- @line{qw/status sim/} = $line{status} =~ /(R)(\d+)/
- if $line{status} =~ /^R/;
- push @ret, \%line;
- }
+Return a list of hashes representing each reflog entry.
- return @ret;
- }
+FIXME Should this return objects?
+=cut
method reflog (@logargs) {
my @entries
= $self->run_cmd(qw(log -g), @logargs)
=~ /(^commit.+?(?:(?=^commit)|(?=\z)))/msg;
-# commit 02526fc15beddf2c64798a947fecdd8d11bf993d
-# Reflog: HEAD@{14} (The Git Server <git@git.dev.venda.com>)
-# Reflog message: push
-# Author: Foo Barsby <fbarsby@example.com>
-# Date: Thu Sep 17 12:26:05 2009 +0100
-#
-# Merge branch 'abc123'
+ # commit 02526fc15beddf2c64798a947fecdd8d11bf993d
+ # Reflog: HEAD@{14} (The Git Server <git@git.dev.venda.com>)
+ # Reflog message: push
+ # Author: Foo Barsby <fbarsby@example.com>
+ # Date: Thu Sep 17 12:26:05 2009 +0100
+ #
+ # Merge branch 'abc123'
return map {
# XXX Stuff like this makes me want to switch to Git::PurePerl
} @entries;
}
- # Compatibility
-
-=head2 info
-
-Returns a hash containing properties of this project. The keys will
-be:
-
- name
- description (empty if .git/description is empty/unnamed)
- owner
- last_change
-
-=cut
-
- method info {
- return {
- name => $self->name,
- description => $self->description,
- owner => $self->owner,
- last_change => $self->last_change,
- };
- };
-
+ ## BUILDERS
method _build__util {
Gitalist::Git::Util->new(
project => $self,
}
method _build_description {
- my $description = "";
eval {
- $description = $self->path->file('description')->slurp;
- chomp $description;
+ return $self->gpp->description;
};
- return $description;
+ if ($@) {
+ return "Unnamed repository.";
+ }
+
}
method _build_owner {
return $last_change;
}
+ method _build_heads {
+ my @revlines = $self->run_cmd_list(qw/for-each-ref --sort=-committerdate /, '--format=%(objectname)%00%(refname)%00%(committer)', 'refs/heads');
+ my @ret;
+ for my $line (@revlines) {
+ my ($rev, $head, $commiter) = split /\0/, $line, 3;
+ $head =~ s!^refs/heads/!!;
+
+ push @ret, { sha1 => $rev, name => $head };
+
+ #FIXME: That isn't the time I'm looking for..
+ if (my ($epoch, $tz) = $line =~ /\s(\d+)\s+([+-]\d+)$/) {
+ my $dt = DateTime->from_epoch(epoch => $epoch);
+ $dt->set_time_zone($tz);
+ $ret[-1]->{last_change} = $dt;
+ }
+ }
+
+ return \@ret;
+ }
+
+ method _build_references {
+ # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
+ # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
+ my @reflist = $self->run_cmd_list(qw(show-ref --dereference))
+ or return;
+ my %refs;
+ for (@reflist) {
+ push @{$refs{$1}}, $2
+ if m!^($SHA1RE)\srefs/(.*)$!;
+ }
+
+ return \%refs;
+ }
+
+ ## Private methods
+ method _is_valid_rev (Str $rev) {
+ return ($rev =~ /^($SHA1RE)$/);
+ }
+
+ method _parse_rev_list ($output) {
+ return
+ map $self->get_gpp_object($_),
+ grep $self->_is_valid_rev($_),
+ map split(/\n/, $_, 6), split /\0/, $output;
+ }
+
=head1 SEE ALSO
L<Gitalist::Git::Util> L<Gitalist::Git::Object>