@@ -14,6 +14,8 @@ Revision history for Perl module Git::PurePerl: to martijn) - allow bare repositories with the gitdir parameter (thanks to martijn) + - fill new commits with real author, authored_time, committer, + committed_time and comment (thanks to martijn) 0.40 Fri Mar 13 15:29:02 GMT 2009 - Skip protocol tests on Win32 (thanks to fayland) CHANGES @@ -2,28 +2,47 @@ package Git::PurePerl::NewObject::Commit; use Moose; use MooseX::StrictConstructor; use Moose::Util::TypeConstraints; +use DateTime; extends 'Git::PurePerl::NewObject'; has 'kind' => ( is => 'ro', isa => 'ObjectKind', required => 1, default => 'commit' ); -has 'tree' => ( is => 'rw', isa => 'Str', required => 1 ); -has 'parent' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'author' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'committer' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'comment' => ( is => 'rw', isa => 'Str', required => 0 ); +has 'tree' => ( is => 'rw', isa => 'Str', required => 1 ); +has 'parent' => ( is => 'rw', isa => 'Str', required => 0 ); +has 'author' => ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 1 ); +has 'authored_time' => ( is => 'rw', isa => 'DateTime', required => 1 ); +has 'committer' => + ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 1 ); +has 'committed_time' => ( is => 'rw', isa => 'DateTime', required => 1 ); +has 'comment' => ( is => 'rw', isa => 'Str', required => 1 ); __PACKAGE__->meta->make_immutable; sub _build_content { my $self = shift; my $content; + $content .= 'tree ' . $self->tree . "\n"; $content .= 'parent ' . $self->parent . "\n" if $self->parent; - $content .= "author Leon Brocard <acme\@astray.com> 1226651274 +0000\n"; $content - .= "committer Leon Brocard <acme\@astray.com> 1226651274 +0000\n"; + .= "author " + . $self->author->name . ' <' + . $self->author->email . "> " + . $self->authored_time->epoch . " " + . DateTime::TimeZone->offset_as_string( $self->authored_time->offset ) + . "\n"; + $content + .= "committer " + . $self->committer->name . ' <' + . $self->author->email . "> " + . $self->committed_time->epoch . " " + . DateTime::TimeZone->offset_as_string( + $self->committed_time->offset ) + . "\n"; $content .= "\n"; - $content .= "A comment\n"; + my $comment = $self->comment; + chomp $comment; + $content .= "$comment\n"; $self->content($content); } lib/Git/PurePerl/NewObject/Commit.pm @@ -1,7 +1,7 @@ #!perl use strict; use warnings; -use Test::More tests => 61; +use Test::More tests => 97; use Git::PurePerl; use Path::Class; @@ -64,13 +64,33 @@ for my $directory (qw(test-init test-init-bare.git)) { is( $directory_entry2->filename, 'there.txt' ); is( $directory_entry2->sha1, 'c78ee1a5bdf46d22da300b68d50bc45c587c3293' ); - my $commit = Git::PurePerl::NewObject::Commit->new( tree => $tree->sha1 ); - is( $commit->sha1, 'd75f1437e0c19c36f9b52312eeb6b0200dbd22ac' ); + my $actor = Git::PurePerl::Actor->new( + name => 'Your Name Comes Here', + email => 'you@yourdomain.example.com' + ); + my $commit = Git::PurePerl::NewObject::Commit->new( + tree => $tree->sha1, + author => $actor, + authored_time => DateTime->from_epoch( epoch => 1240341681 ), + committer => $actor, + committed_time => DateTime->from_epoch( epoch => 1240341682 ), + comment => 'Fix', + ); + is( $commit->sha1, '860caea5ba298bb4f1df9a80fad84951fcc7db72' ); $git->put_object($commit); my $commit2 - = $git->get_object('d75f1437e0c19c36f9b52312eeb6b0200dbd22ac'); + = $git->get_object('860caea5ba298bb4f1df9a80fad84951fcc7db72'); is( $commit2->tree_sha1, $tree->sha1 ); + isa_ok( $commit2->author, 'Git::PurePerl::Actor' ); + is( $commit2->author->name, 'Your Name Comes Here' ); + is( $commit2->author->email, 'you@yourdomain.example.com' ); + isa_ok( $commit2->committer, 'Git::PurePerl::Actor' ); + is( $commit2->committer->name, 'Your Name Comes Here' ); + is( $commit2->committer->email, 'you@yourdomain.example.com' ); + is( $commit2->authored_time->epoch, 1240341681 ); + is( $commit2->committed_time->epoch, 1240341682 ); + is( $commit2->comment, 'Fix' ); if ( $directory eq 'test-init-bare.git' ) { $git = Git::PurePerl->new( gitdir => $directory ); @@ -121,11 +141,27 @@ for my $directory (qw(test-init test-init-bare.git)) { directory_entries => [ $hello_de, $here_de ] ); $git->put_object($tree); my $newcommit = Git::PurePerl::NewObject::Commit->new( - tree => $tree->sha1, - parent => $commit->sha1 + tree => $tree->sha1, + parent => $commit->sha1, + author => $actor, + authored_time => DateTime->from_epoch( epoch => 1240341683 ), + committer => $actor, + committed_time => DateTime->from_epoch( epoch => 1240341684 ), + comment => 'Fix again', ); $git->put_object($newcommit); + my $newcommit2 = $git->get_object( $newcommit->sha1 ); + isa_ok( $newcommit2->author, 'Git::PurePerl::Actor' ); + is( $newcommit2->author->name, 'Your Name Comes Here' ); + is( $newcommit2->author->email, 'you@yourdomain.example.com' ); + isa_ok( $newcommit2->committer, 'Git::PurePerl::Actor' ); + is( $newcommit2->committer->name, 'Your Name Comes Here' ); + is( $newcommit2->committer->email, 'you@yourdomain.example.com' ); + is( $newcommit2->authored_time->epoch, 1240341683 ); + is( $newcommit2->committed_time->epoch, 1240341684 ); + is( $newcommit2->comment, 'Fix again' ); + is( $git->ref('refs/heads/master')->sha1, $newcommit->sha1, 'master updated' ); t/init.t 377b00844e5f1e6ce27529e80cf093ef2322116e Leon Brocard acme@astray.com http://github.com/acme/git-pureperl/commit/beaed08934bfe7d6bac92f14d8913faa675ceb7c beaed08934bfe7d6bac92f14d8913faa675ceb7c 2009-04-21T12:37:36-07:00 2009-04-21T12:37:36-07:00 fill new commits with real author, authored_time, committer, committed_time and comment (thanks to martijn) 8fc07b70e9d8dc9929de160569314d05605b3d16 Leon Brocard acme@astray.com