X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=blobdiff_plain;f=lib%2FGitalist%2FGit%2FRepository.pm;h=abd23305fab0f353a70a362f156a3d71c58d1bc8;hp=05ddc9f44d82907a0315e4f33b5b955f644544b1;hb=86b3e7ce8d1bb126b7967ec549c010cd707f318c;hpb=5ed74c87289454051bd0defcbb67c69f9cc6a799 diff --git a/lib/Gitalist/Git/Repository.pm b/lib/Gitalist/Git/Repository.pm index 05ddc9f..abd2330 100644 --- a/lib/Gitalist/Git/Repository.pm +++ b/lib/Gitalist/Git/Repository.pm @@ -1,33 +1,43 @@ use MooseX::Declare; -class Gitalist::Git::Repository with Gitalist::Git::HasUtils { - # FIXME, use Types::Path::Class and coerce +class Gitalist::Git::Repository with (Gitalist::Git::HasUtils, Gitalist::Git::Serializable) { + use MooseX::Storage::Meta::Attribute::Trait::DoNotSerialize; + use MooseX::Types::Common::String qw/NonEmptySimpleStr/; - use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/; - use Gitalist::Git::Types qw/SHA1 DateTime Dir/; + use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/; + use Gitalist::Git::Types qw/SHA1 Dir/; + use MooseX::Types::DateTime qw/ DateTime /; + use Moose::Autobox; - use List::MoreUtils qw/any zip/; use aliased 'DateTime' => 'DT'; - use Encode qw/decode/; - use I18N::Langinfo qw/langinfo CODESET/; + use List::MoreUtils qw/any zip/; + use Encode qw/decode/; + + use if $^O ne 'MSWin32' => 'I18N::Langinfo', qw/langinfo CODESET/; + use Gitalist::Git::Object::Blob; use Gitalist::Git::Object::Tree; use Gitalist::Git::Object::Commit; use Gitalist::Git::Object::Tag; - - with 'Gitalist::Serializeable'; + use Gitalist::Git::Head; + use Gitalist::Git::Tag; our $SHA1RE = qr/[0-9a-fA-F]{40}/; - around BUILDARGS (ClassName $class: Dir $dir) { + around BUILDARGS (ClassName $class: Dir $dir, Str $override_name = '') { # Allows us to be called as Repository->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')); + if(-f $dir->file('.git', 'HEAD')) { # Non-bare repo above .git + $dir = $dir->subdir('.git'); + $name = $dir->dir_list(-2, 1); # .../name/.git + } elsif('.git' eq $dir->dir_list(-1)) { # Non-bare repo in .git + $name = $dir->dir_list(-2); + } confess("Can't find a git repository at " . $dir) - unless ( -f $dir->file('HEAD') ); - return $class->$orig(name => $name, + unless -f $dir->file('HEAD'); + return $class->$orig(name => $override_name || $name, path => $dir); } @@ -36,7 +46,7 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { has path => ( isa => Dir, is => 'ro', required => 1, - traits => [qw/ DoNotSerialize /] ); + traits => ['DoNotSerialize'] ); has description => ( isa => Str, is => 'ro', @@ -61,12 +71,10 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { ? 1 : 0 }, ); - has heads => ( isa => ArrayRef[HashRef], + has heads => ( isa => ArrayRef['Gitalist::Git::Head'], is => 'ro', - lazy_build => 1, - traits => [qw/ DoNotSerialize /], - ); - has tags => ( isa => ArrayRef[HashRef], + lazy_build => 1); + has tags => ( isa => ArrayRef['Gitalist::Git::Tag'], is => 'ro', lazy_build => 1); has references => ( isa => HashRef[ArrayRef[Str]], @@ -74,16 +82,11 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { lazy_build => 1 ); method BUILD { - $self->$_() for qw/last_change owner description references/; # Ensure to build early. + $self->$_() for qw/last_change owner description /; # Ensure to build early. } ## Public methods - method get_object_or_head (NonEmptySimpleStr $ref) { - my $sha1 = is_SHA1($ref) ? $ref : $self->head_hash($ref); - $self->get_object($sha1); - } - method head_hash (Str $head?) { my $output = $self->run_cmd(qw/rev-parse --verify/, $head || 'HEAD' ); confess("No such head: " . $head) unless defined $output; @@ -92,12 +95,6 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { return $sha1; } - method list_tree (SHA1 $sha1?) { - $sha1 ||= $self->head_hash; - my $object = $self->get_object($sha1); - return @{$object->tree}; - } - method get_object (NonEmptySimpleStr $sha1) { unless (is_SHA1($sha1)) { $sha1 = $self->head_hash($sha1); @@ -112,20 +109,6 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { ); } - method hash_by_path ($base, $path = '', $type?) { - $path =~ s{/+$}(); - # FIXME should this really just take the first result? - my @paths = $self->run_cmd('ls-tree', $base, '--', $path) - or return; - my $line = $paths[0]; - - #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c' - $line =~ m/^([0-9]+) (.+) ($SHA1RE)\t/; - return defined $type && $type ne $2 - ? () - : $3; - } - method list_revs ( NonEmptySimpleStr :$sha1!, Int :$count?, Int :$skip?, @@ -183,16 +166,6 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { # TODO - support compressed archives } - method diff ( Gitalist::Git::Object :$commit!, - Bool :$patch?, - Maybe[NonEmptySimpleStr] :$parent?, - NonEmptySimpleStr :$filename? - ) { - return $commit->diff( patch => $patch, - parent => $parent, - filename => $filename); - } - method reflog (@logargs) { my @entries = $self->run_cmd(qw(log -g), @logargs) @@ -247,13 +220,15 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { $description = $self->path->file('description')->slurp; chomp $description; }; - $description = "Unnamed repository, edit the .git/description file to set a description" - if $description eq "Unnamed repository; edit this file 'description' to name the repository."; + $description = "Unnamed repository, edit the .git/description file to set a description" + if $description eq "Unnamed repository; edit this file 'description' to name the repository."; return $description; } method _build_owner { - my ($gecos, $name) = map { decode(langinfo(CODESET), $_) } (getpwuid $self->path->stat->uid)[6,0]; + return 'system' if $^O =~ 'MSWin32'; + + my ($gecos, $name) = map { decode(langinfo(CODESET()), $_) } (getpwuid $self->path->stat->uid)[6,0]; $gecos =~ s/,+$//; return length($gecos) ? $gecos : $name; } @@ -276,19 +251,8 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { 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 = DT->from_epoch(epoch => $epoch); - $dt->set_time_zone($tz); - $ret[-1]->{last_change} = $dt; - } + push @ret, Gitalist::Git::Head->new($line); } - return \@ret; } @@ -298,24 +262,10 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { '--format=%(objectname) %(objecttype) %(refname) %(*objectname) %(*objecttype) %(subject)%00%(creator)', 'refs/tags' ); - my @ret; - for my $line (@revlines) { - my($refinfo, $creatorinfo) = split /\0/, $line; - my($rev, $type, $name, $refid, $reftype, $title) = split(' ', $refinfo, 6); - my($creator, $epoch, $tz) = ($creatorinfo =~ /^(.*) ([0-9]+) (.*)$/); - $name =~ s!^refs/tags/!!; - - push @ret, { sha1 => $rev, name => $name }; - - #FIXME: That isn't the time I'm looking for.. - if($epoch and $tz) { - my $dt = DT->from_epoch(epoch => $epoch); - $dt->set_time_zone($tz); - $ret[-1]->{last_change} = $dt; - } - } - - return \@ret; + return [ + map Gitalist::Git::Tag->new($_), + grep Gitalist::Git::Tag::is_valid_tag($_), @revlines + ]; } method _build_references { @@ -405,20 +355,10 @@ Hashref of ArrayRefs for each reference. Return the sha1 for HEAD, or any specified head. -=head2 list_tree ($sha1?) - -Return an array of contents for a given tree. -The tree is specified by sha1, and defaults to HEAD. -Each item is a L. - =head2 get_object ($sha1) Return an appropriate subclass of L for the given sha1. -=head2 hash_by_path ($sha1, $path, $type?) - -Returns the sha1 for a given path, optionally limited by type. - =head2 list_revs ($sha1, $count?, $skip?, \%search?, $file?) Returns a list of revs for the given head ($sha1).