X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FGit%2FProject.pm;h=57d46bb3b58c3237aaef254df954cc9fadbedc27;hb=f30835707d7ddcf4df019b81e1c58b70ea3735f1;hp=96a7561e2eb1150fffbdcaef2ce85093cd07bcba;hpb=561a3f14355ad9be71303a28424e8aec2d7798cc;p=catagits%2FGitalist.git diff --git a/lib/Gitalist/Git/Project.pm b/lib/Gitalist/Git/Project.pm index 96a7561..57d46bb 100644 --- a/lib/Gitalist/Git/Project.pm +++ b/lib/Gitalist/Git/Project.pm @@ -23,17 +23,34 @@ class Gitalist::Git::Project with Gitalist::Git::HasUtils { # FIXME, use Types::Path::Class and coerce use MooseX::Types::Common::String qw/NonEmptySimpleStr/; use MooseX::Types::Path::Class qw/Dir/; - use MooseX::Types::Moose qw/Str Maybe Bool HashRef/; + use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/; use List::MoreUtils qw/any zip/; use DateTime; + use Gitalist::Git::Object::Commit; + use Gitalist::Git::Object::Blob; use aliased 'Gitalist::Git::Object'; + 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) + unless ( -f $dir->file('HEAD') ); + return $class->$orig(name => $name, + path => $dir); + } + =head1 ATTRIBUTES =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 ); @@ -42,7 +59,6 @@ class Gitalist::Git::Project with Gitalist::Git::HasUtils { L for the location of the git repository. =cut - has path => ( isa => Dir, is => 'ro', required => 1); @@ -51,7 +67,6 @@ L for the location of the git repository. String containing .git/description =cut - has description => ( isa => Str, is => 'ro', lazy_build => 1, @@ -62,7 +77,6 @@ String containing .git/description Owner of the files on disk. =cut - has owner => ( isa => NonEmptySimpleStr, is => 'ro', lazy_build => 1, @@ -74,7 +88,6 @@ L for the time of the last update. undef if the repository has never been used. =cut - has last_change => ( isa => Maybe['DateTime'], is => 'ro', lazy_build => 1, @@ -85,7 +98,6 @@ undef if the repository has never been used. Bool indicating whether this Project is bare. =cut - has is_bare => ( isa => Bool, is => 'ro', lazy => 1, @@ -95,187 +107,90 @@ Bool indicating whether this Project is bare. }, ); - method BUILD { - $self->$_() for qw/last_change owner description/; # Ensure to build early. - } - - around BUILDARGS (ClassName $class: Dir $dir) { - 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) - unless ( -f $dir->file('HEAD') ); - return $class->$orig(name => $name, - path => $dir); - } - - method _build__util { - Gitalist::Git::Util->new( - project => $self, - ); - } - - our $SHA1RE = qr/[0-9a-fA-F]{40}/; - - method _build_description { - my $description = ""; - eval { - $description = $self->{path}->file('description')->slurp; - chomp $description; - }; - return $description; - } - - method _build_owner { - my ($gecos, $name) = (getpwuid $self->{path}->stat->uid)[6,0]; - $gecos =~ s/,+$//; - return length($gecos) ? $gecos : $name; - } - - method _build_last_change { - my $last_change; - my $output = $self->run_cmd( - qw{ for-each-ref --format=%(committer) - --sort=-committerdate --count=1 refs/heads - }); - if (my ($epoch, $tz) = $output =~ /\s(\d+)\s+([+-]\d+)$/) { - my $dt = DateTime->from_epoch(epoch => $epoch); - $dt->set_time_zone($tz); - $last_change = $dt; - } - return $last_change; - } - =head2 heads -Return an array containing the list of heads. +ArrayRef of hashes containing the name and sha1 of all heads. =cut - - method heads { - my $cmdout = $self->run_cmd(qw/for-each-ref --sort=-committerdate /, '--format=%(objectname)%00%(refname)%00%(committer)', 'refs/heads'); - my @output = $cmdout ? split(/\n/, $cmdout) : (); - my @ret; - for my $line (@output) { - 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; - } + has heads => ( isa => ArrayRef[HashRef], + is => 'ro', + lazy_build => 1); =head2 references -Return a hash of references. +Hashref of ArrayRefs for each reference. =cut + has references => ( isa => HashRef[ArrayRef[Str]], + is => 'ro', + lazy_build => 1 ); - method references { - return $self->{references} - if $self->{references}; - - # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11 - # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{} - my $cmdout = $self->run_cmd(qw(show-ref --dereference)) - or return; - my @reflist = $cmdout ? split(/\n/, $cmdout) : (); - my %refs; - for(@reflist) { - push @{$refs{$1}}, $2 - if m!^($SHA1RE)\srefs/(.*)$!; - } + method BUILD { + $self->$_() for qw/last_change owner description/; # Ensure to build early. + } - return $self->{references} = \%refs; -} +=head1 METHODS -=head2 head_hash +=head2 head_hash ($head?) -Find the hash of a given head (defaults to 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' ); - return unless defined $output; + confess("No such head: " . $head) unless defined $output; my($sha1) = $output =~ /^($SHA1RE)$/; return $sha1; } -=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. =cut - method list_tree (Str $sha1?) { $sha1 ||= $self->head_hash; + my $object = $self->get_object($sha1); + return @{$object->tree}; + } - my $output = $self->run_cmd(qw/ls-tree -z/, $sha1); - return unless defined $output; +=head2 get_object ($sha1) - my @ret; - for my $line (split /\0/, $output) { - my ($mode, $type, $object, $file) = split /\s+/, $line, 4; - push @ret, Object->new( mode => oct $mode, - type => $type, - sha1 => $object, - file => $file, - project => $self, - ); - } - return @ret; - } +Return a L for the given sha1. +=cut method get_object (NonEmptySimpleStr $sha1) { unless ( $self->_is_valid_rev($sha1) ) { $sha1 = $self->head_hash($sha1); } - return Object->new( + my $type = $self->run_cmd('cat-file', '-t', $sha1); + chomp($type); + my $class = 'Gitalist::Git::Object'; + use Moose::Autobox; + if ($type eq ['commit', 'blob']->any) { + $class .= '::' . ucfirst($type); + }; + return $class->new( project => $self, sha1 => $sha1, + type => $type, ); } - method _is_valid_rev (Str $rev) { - return ($rev =~ /^($SHA1RE)$/); - } +=head2 hash_by_path($sha1, $path, $type?) - # Should be in ::Object - method get_object_mode_string (Gitalist::Git::Object $object) { - return $object->modestr; - } - - method get_object_type (NonEmptySimpleStr $sha1) { - return $self->get_object($sha1)->type; - } +Returns the sha1 for a given path, optionally limited by type. - method cat_file (NonEmptySimpleStr $sha1) { - return $self->get_object($sha1)->contents; - } - - method hash_by_path ($base, $path?, $type?) { - $path ||= ''; +=cut + method hash_by_path ($base, $path = '', $type?) { $path =~ s{/+$}(); - - my $output = $self->run_cmd('ls-tree', $base, '--', $path) + # FIXME should this really just take the first result? + my @paths = $self->run_cmd('ls-tree', $base, '--', $path) or return; - my($line) = $output ? split(/\n/, $output) : (); + my $line = $paths[0]; #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c' $line =~ m/^([0-9]+) (.+) ($SHA1RE)\t/; @@ -284,17 +199,21 @@ The keys for each item will be: : $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 = ( @@ -317,130 +236,46 @@ The keys for each item will be: ); 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; +=head2 diff($commit, $patch?, $parent?, $file?) - # The blank line between the tree and the patch. - shift @out; +Generate a diff from a given L. - # 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; - } - - if(/^index (\w+)\.\.(\w+) (\d+)$/) { - @{$ret[-1]}{qw(index src dst mode)} = ($_, $1, $2, $3); - next - } - - # 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 -- +=head2 reflog(@lorgargs) - method raw_diff (@args) { - my $cmdout = $self->run_cmd( - qw(diff-tree -r -M --no-commit-id --full-index), - @args - ); - return $cmdout ? split(/\n/, $cmdout) : (); - } +Return a list of hashes representing each reflog entry. - 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 @ret; - } +FIXME Should this return objects? +=cut method reflog (@logargs) { my @entries = $self->run_cmd(qw(log -g), @logargs) =~ /(^commit.+?(?:(?=^commit)|(?=\z)))/msg; -=pod - commit 02526fc15beddf2c64798a947fecdd8d11bf993d - Reflog: HEAD@{14} (The Git Server ) - Reflog message: push - Author: Foo Barsby - Date: Thu Sep 17 12:26:05 2009 +0100 - - Merge branch 'abc123' - -=cut + # commit 02526fc15beddf2c64798a947fecdd8d11bf993d + # Reflog: HEAD@{14} (The Git Server ) + # Reflog message: push + # Author: Foo Barsby + # 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 @@ -470,28 +305,87 @@ The keys for each item will be: } @entries; } - # Compatibility + ## BUILDERS + method _build__util { + Gitalist::Git::Util->new( + project => $self, + ); + } -=head2 info + method _build_description { + my $description = ""; + eval { + $description = $self->path->file('description')->slurp; + chomp $description; + }; + return $description; + } -Returns a hash containing properties of this project. The keys will -be: + method _build_owner { + my ($gecos, $name) = (getpwuid $self->path->stat->uid)[6,0]; + $gecos =~ s/,+$//; + return length($gecos) ? $gecos : $name; + } - name - description (empty if .git/description is empty/unnamed) - owner - last_change + method _build_last_change { + my $last_change; + my $output = $self->run_cmd( + qw{ for-each-ref --format=%(committer) + --sort=-committerdate --count=1 refs/heads + }); + if (my ($epoch, $tz) = $output =~ /\s(\d+)\s+([+-]\d+)$/) { + my $dt = DateTime->from_epoch(epoch => $epoch); + $dt->set_time_zone($tz); + $last_change = $dt; + } + return $last_change; + } -=cut + 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/!!; - method info { - return { - name => $self->name, - description => $self->description, - owner => $self->owner, - last_change => $self->last_change, - }; - }; + 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