use MooseX::Types::Moose qw/Str Int Bool Maybe ArrayRef/;
use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
use File::Stat::ModeString qw/mode_to_string/;
- use List::MoreUtils qw/any zip/;
-
- our $SHA1RE = qr/[0-9a-fA-F]{40}/;
# project and sha1 are required initargs
has project => ( isa => 'Gitalist::Git::Project',
required => 1,
is => 'ro' );
+ has type => ( isa => NonEmptySimpleStr,
+ is => 'ro',
+ required => 1 );
+
has $_ => ( isa => NonEmptySimpleStr,
required => 1,
is => 'ro',
lazy_build => 1 )
- for qw/type modestr size/;
+ for qw/modestr size/;
has _gpp_obj => ( isa => 'Git::PurePerl::Object',
required => 1,
is => 'ro',
lazy_build => 1,
- handles => [ 'parents',
- 'parent_sha1',
- 'author',
- 'authored_time',
- 'committer',
- 'committed_time',
+ handles => [ 'content',
],
);
- # This feels wrong, but current templates assume
- # these attributes are present on every object.
- foreach my $key (qw/tree_sha1 comment content/) {
- has $key => ( isa => Str,
- required => 1,
- is => 'ro',
- lazy_build => 1,
- );
- method "_build_$key" {
- confess("Object can't " . $key) unless $self->_gpp_obj->can($key);
- return $self->_gpp_obj->$key;
- }
- }
-
# objects can't determine their mode or filename
has file => ( isa => NonEmptySimpleStr,
required => 0,
default => 0,
is => 'ro' );
- has tree => ( isa => 'ArrayRef[Gitalist::Git::Object]',
- required => 0,
- is => 'ro',
- lazy_build => 1 );
-
- method BUILD { $self->$_() for qw/_gpp_obj type size modestr/ }
-
- method _build_tree {
- confess("Can't list_tree on a blob object.")
- if $self->type eq 'blob';
- my $output = $self->_run_cmd(qw/ls-tree -z/, $self->sha1);
- return unless defined $output;
-
- my @ret;
- for my $line (split /\0/, $output) {
- my ($mode, $type, $object, $file) = split /\s+/, $line, 4;
- push @ret, Gitalist::Git::Object->new( mode => oct $mode,
- type => $type,
- sha1 => $object,
- file => $file,
- project => $self->project,
- );
- }
- return \@ret;
- }
-
- method diff ( Maybe[Bool] :$patch?,
- Maybe[NonEmptySimpleStr] :$parent?,
- Maybe[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
- : $self->parents <= 1
- ? $self->parent_sha1
- : '-c';
- my @etc = (
- ( $file ? ('--', $file) : () ),
- );
-
- my @out = $self->_raw_diff(
- ( $patch ? '--patch-with-raw' : () ),
- ( $parent ? $parent : () ),
- $self->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 BUILD { $self->$_() for qw/_gpp_obj size modestr/ }
## Private methods
- # 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
- );
- }
-
- 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;
- }
-
- 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";
- }
-
- return @ret;
- }
-
## Builders
-method _build__gpp_obj {
+ method _build__gpp_obj {
return $self->_get_gpp_object($self->sha1)
}
- foreach my $key (qw/ type size /) {
- method "_build_$key" {
- my $v = $self->_cat_file_with_flag(substr($key, 0, 1));
- chomp($v);
- return $v;
- }
+ method "_build_size" {
+ my $v = $self->_cat_file_with_flag('s');
+ chomp($v);
+ return $v;
}
method _build_modestr {
--- /dev/null
+package Gitalist::Git::Object::Blob;
+use MooseX::Declare;
+
+class Gitalist::Git::Object::Blob extends Gitalist::Git::Object {
+ has '+type' => ( default => 'blob' );
+}
--- /dev/null
+package Gitalist::Git::Object::Commit;
+use MooseX::Declare;
+
+class Gitalist::Git::Object::Commit
+ extends Gitalist::Git::Object
+ with Gitalist::Git::Object::HasTree {
+ use MooseX::Types::Moose qw/Str Int Bool Maybe ArrayRef/;
+ use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
+ use List::MoreUtils qw/any zip/;
+ our $SHA1RE = qr/[0-9a-fA-F]{40}/;
+
+ has '+type' => ( default => 'commit' );
+ has '+_gpp_obj' => ( handles => [ 'comment',
+ 'tree_sha1',
+ 'committer',
+ 'committed_time',
+ 'author',
+ 'authored_time',
+ 'parents',
+ 'parent_sha1',
+ 'parent_sha1s',
+ ],
+ );
+
+ method diff ( Maybe[Bool] :$patch?,
+ Maybe[NonEmptySimpleStr] :$parent?,
+ Maybe[NonEmptySimpleStr] :$file?
+ ) {
+ $parent = $parent
+ ? $parent
+ : $self->parents <= 1
+ ? $self->parent_sha1
+ : '-c';
+ my @etc = (
+ ( $file ? ('--', $file) : () ),
+ );
+
+ my @out = $self->_raw_diff(
+ ( $patch ? '--patch-with-raw' : () ),
+ ( $parent ? $parent : () ),
+ $self->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)];
+ }
+
+ ## Private methods
+ # 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
+ );
+ }
+
+ 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;
+ }
+
+ 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";
+ }
+
+ return @ret;
+ }
+
+ }
--- /dev/null
+package Gitalist::Git::Object::HasTree;
+use MooseX::Declare;
+
+role Gitalist::Git::Object::HasTree {
+ has tree => ( isa => 'ArrayRef[Gitalist::Git::Object]',
+ required => 0,
+ is => 'ro',
+ lazy_build => 1 );
+
+
+## Builders
+ method _build_tree {
+ my $output = $self->_run_cmd(qw/ls-tree -z/, $self->sha1);
+ return unless defined $output;
+
+ my @ret;
+ for my $line (split /\0/, $output) {
+ my ($mode, $type, $object, $file) = split /\s+/, $line, 4;
+ my $class = 'Gitalist::Git::Object::' . ucfirst($type);
+ push @ret, $class->new( mode => oct $mode,
+ type => $type,
+ sha1 => $object,
+ file => $file,
+ project => $self->project,
+ );
+ }
+ return \@ret;
+ }
+
+}
--- /dev/null
+package Gitalist::Git::Object::Tag;
+use MooseX::Declare;
+
+class Gitalist::Git::Object::Tag extends Gitalist::Git::Object {
+ has '+type' => ( default => 'tag' );
+ has '+_gpp_obj' => ( handles => [ 'object',
+ 'tag',
+ 'tagger',
+ 'tagged_time',
+ ],
+ );
+
+}
--- /dev/null
+package Gitalist::Git::Object::Tree;
+use MooseX::Declare;
+
+class Gitalist::Git::Object::Tree
+ extends Gitalist::Git::Object
+ with Gitalist::Git::Object::HasTree {
+ has '+type' => ( default => 'tree' );
+ has '+_gpp_obj' => ( handles => [ 'directory_entries',
+ ],
+ );
+ }
use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/;
use List::MoreUtils qw/any zip/;
use DateTime;
- use aliased 'Gitalist::Git::Object';
+ use Gitalist::Git::Object::Blob;
+ use Gitalist::Git::Object::Tree;
+ use Gitalist::Git::Object::Commit;
+ use Gitalist::Git::Object::Tag;
our $SHA1RE = qr/[0-9a-fA-F]{40}/;
=head2 get_object ($sha1)
-Return a L<Gitalist::Git::Object> for the given sha1.
+Return an appropriate subclass of 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);
}
- return Object->new(
+ my $type = $self->run_cmd('cat-file', '-t', $sha1);
+ chomp($type);
+ my $class = 'Gitalist::Git::Object::' . ucfirst($type);
+ $class->new(
project => $self,
sha1 => $sha1,
+ type => $type,
);
}
dir("$Bin/lib/repositories/repo1"),
);
-BEGIN { use_ok 'Gitalist::Git::Object' }
+BEGIN {
+ use_ok 'Gitalist::Git::Object::Tree';
+ use_ok 'Gitalist::Git::Object::Blob';
+ use_ok 'Gitalist::Git::Object::Commit';
+ use_ok 'Gitalist::Git::Object::Tag';
+ }
-my $object = Gitalist::Git::Object->new(
+my $object = Gitalist::Git::Object::Tree->new(
project => $project,
sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1',
type => 'tree',
file => 'dir1',
mode => 16384,
);
-isa_ok($object, 'Gitalist::Git::Object');
+isa_ok($object, 'Gitalist::Git::Object::Tree', 'tree object');
is($object->sha1,'729a7c3f6ba5453b42d16a43692205f67fb23bc1', 'sha1 is correct');
is($object->type, 'tree', 'type is correct');
is($object->file, 'dir1', 'file is correct');
is($object->size, 33, "size is correct");
# Create object from sha1.
-my $obj2 = Gitalist::Git::Object->new(
+my $obj2 = Gitalist::Git::Object::Blob->new(
project => $project,
sha1 => '5716ca5987cbf97d6bb54920bea6adde242d87e6',
);
-isa_ok($obj2, 'Gitalist::Git::Object');
+isa_ok($obj2, 'Gitalist::Git::Object::Blob', 'blob object');
is($obj2->sha1,'5716ca5987cbf97d6bb54920bea6adde242d87e6', 'sha1 is correct');
is($obj2->type, 'blob', 'type is correct');
is($obj2->mode, 0, 'mode is correct');
print $obj2->comment;
} 'comment is an empty string';
-my $commit_obj = Gitalist::Git::Object->new(
+my $commit_obj = Gitalist::Git::Object::Commit->new(
project => $project,
sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e',
);
-isa_ok($commit_obj, 'Gitalist::Git::Object', "commit object type correct");
+isa_ok($commit_obj, 'Gitalist::Git::Object::Commit', "commit object");
my ($tree, $patch) = $commit_obj->diff(
parent => undef,
file => undef,
isa_ok(($proj->list_tree)[1], 'Gitalist::Git::Object');
# Return an ::Object from a sha1
-my $obj1 = $proj->get_object('5716ca5987cbf97d6bb54920bea6adde242d87e6');
-isa_ok($obj1, 'Gitalist::Git::Object');
+my $obj1 = $proj->get_object('729a7c3f6ba5453b42d16a43692205f67fb23bc1');
+isa_ok($obj1, 'Gitalist::Git::Object::Tree');
my $hbp_sha1 = $proj->hash_by_path('36c6c6708b8360d7023e8a1649c45bcf9b3bd818', 'dir1/file2');
my $obj2 = $proj->get_object($hbp_sha1);
+isa_ok($obj2, 'Gitalist::Git::Object::Blob');
is($obj2->type, 'blob', 'hash_by_path obj is a file');
is($obj2->content, "foo\n", 'hash_by_path obj is a file');
+my $obj3 = $proj->get_object($proj->head_hash);
+isa_ok($obj3, 'Gitalist::Git::Object::Commit');
+
like($proj->head_hash('HEAD'), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
{