has _util => ( isa => 'Gitalist::Git::Util',
is => 'ro',
lazy_build => 1,
- handles => [ 'run_cmd', 'run_cmd_list', 'get_gpp_object' ],
+ handles => [ 'run_cmd',
+ 'run_cmd_list',
+ 'get_gpp_object',
+ 'gpp',
+ ],
);
sub _build__util { confess(shift() . " cannot build _util") }
use Moose::Autobox;
class Gitalist::Git::Object {
- use MooseX::Types::Moose qw/Str Int/;
+ 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,
weak_ref => 1,
handles => {
_run_cmd => 'run_cmd',
+ _run_cmd_list => 'run_cmd_list',
_get_gpp_object => 'get_gpp_object',
},
);
has sha1 => ( isa => NonEmptySimpleStr,
- required => 1,
- is => 'ro' );
+ required => 1,
+ is => 'ro' );
has $_ => ( isa => NonEmptySimpleStr,
- required => 1,
- is => 'ro',
- lazy_build => 1 )
+ required => 1,
+ is => 'ro',
+ lazy_build => 1 )
for qw/type modestr size/;
has _gpp_obj => ( isa => 'Git::PurePerl::Object',
required => 0,
is => 'ro' );
has mode => ( isa => Int,
- required => 1,
- default => 0,
- is => 'ro' );
+ required => 1,
+ 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__gpp_obj {
+ 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)];
+ }
+
+## 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 {
return $self->_get_gpp_object($self->sha1)
}
=cut
method list_tree (Str $sha1?) {
$sha1 ||= $self->head_hash;
-
- my $output = $self->run_cmd(qw/ls-tree -z/, $sha1);
- return unless defined $output;
-
- 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;
+ my $object = $self->get_object($sha1);
+ return @{$object->tree};
}
=head2 get_object ($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 = (
=head2 diff($commit, $patch?, $parent?, $file?)
-Generate a diff.
-
-FIXME this should be a method on the commit object.
+Generate a diff from a given L<Gitalist::Git::Object>.
=cut
- # 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)];
+ NonEmptySimpleStr :$file?
+ ) {
+ return $commit->diff( patch => $patch,
+ parent => $parent,
+ file => $file);
}
=head2 reflog(@lorgargs)
= $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
# 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
# c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
my @reflist = $self->run_cmd_list(qw(show-ref --dereference))
- or return;
+ or return;
my %refs;
- for(@reflist) {
- push @{$refs{$1}}, $2
- if m!^($SHA1RE)\srefs/(.*)$!;
- }
+ for (@reflist) {
+ push @{$refs{$1}}, $2
+ if m!^($SHA1RE)\srefs/(.*)$!;
+ }
- return \%refs;
+ return \%refs;
}
## Private methods
map split(/\n/, $_, 6), split /\0/, $output;
}
- 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;
- }
-
- # 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
- );
- }
-
=head1 SEE ALSO
L<Gitalist::Git::Util> L<Gitalist::Git::Object>
return $git;
}
- has _gpp => (
+ has gpp => (
isa => 'Git::PurePerl', is => 'ro', lazy => 1,
default => sub {
my $self = shift;
}
method get_gpp_object (NonEmptySimpleStr $sha1) {
- return $self->_gpp->get_object($sha1) || undef;
+ return $self->gpp->get_object($sha1) || undef;
}
} # end class
<a href="[% c.uri_for(theact, {h=item.sha1, hb=commit.sha1, f=(path ? path _ '/' _ item.file : item.file)}) %]">[% item.file %]</a>
</td>
<td class='action-list'>
- <a href="[% c.uri_for(theact, {h=item.object, hb=commit.sha1, f=item.file}) %]">[% theact %]</a>
- <a href="[% c.uri_for('history', {h=item.object}) %]">history</a>
- <a href="[% c.uri_for('raw', {h=item.object}) %]">raw</a>
+ <a href="[% c.uri_for(theact, {h=item.sha1, hb=commit.sha1, f=item.file}) %]">[% theact %]</a>
+ <a href="[% c.uri_for('history', {h=item.sha1, hb=commit.sha1, f=item.file}) %]">history</a>
+ [% IF item.type == 'blob' %]
+ <a href="[% c.uri_for('raw', {hb=commit.sha1, f=item.file}) %]">raw</a>
+ [% END %]
</td>
</tr>
[% END %]
<link rel="stylesheet" type="text/css" href="/static/css/syntax/[% language %].css"/>
[% PROCESS 'nav/actions.tt2' object = head %]
+[% IF object.type == 'commit' %]
<div class='commit-message'>
[% head.comment.substr(0, 85) %] ...
</div>
+[% END %]
<div class='path'>
<a href="[% c.uri_for("tree", {hb=head.sha1}) %]">[% project %]</a>
[% # XXX The last part should link to blob_plain (or something) but doesn't ATM
<a href="[% c.uri_for('log', {h=object.sha1}) %]">log</a> •
<a href="[% c.uri_for('commit', {h=object.sha1}) %]">commit</a> •
<a href="[% c.uri_for('commitdiff', {h=object.sha1}) %]">commitdiff</a> •
+ [% IF object.type == 'commit' %]
<a href="[% c.uri_for('tree', {h=object.tree_sha1, hb=object.sha1}) %]">tree</a>
+ [% END %]
<div class='chroma-hash'>[% INCLUDE '_chroma_hash.tt2' sha1 = object.sha1 %]</div>
</div>
isa_ok($util, 'Gitalist::Git::Util');
like( $util->_git, qr#/git$#, 'git binary found');
-isa_ok($util->_gpp, 'Git::PurePerl', 'gpp instance created');
+isa_ok($util->gpp, 'Git::PurePerl', 'gpp instance created');
done_testing;
repo_dir __path_to(t/lib/repositories)__
</Model::GitRepos>
+name Gitalist
+
+sitename "Gitalist presently"
+
+# URI and label (title) of GIT logo link
+logo_url git-scm.org
+logo_label "git homepage"
+logo_img /git-logo.png
+
+home_link /
+home_link_str "A Gitalist"
+
+# show repository only if this file exists
+# (only effective if this variable evaluates to true)
+# export_ok
+
+# XXX Code in config FAIL
+# show repository only if this subroutine returns true
+# when given the path to the project, for example:
+# sub { return -e "$_[0]/git-daemon-export-ok"; }
+# export_auth_hook
+
+# stylesheet path/to/your/stylesheet.css
+logo /git-logo.png
+favicon /git-favicon.png
+
+# $feature{'blame'}{'default'} = [1];
+<feature>
+ <blame>
+ default = 1
+ </blame>
+</feature>
+
+# fs traversing limit for getting project list
+# the number is relative to the projectroot
+project_maxdepth 2007
+
<paging>
log = 50
summary = 16
projects / catagits/Gitalist.git / commitdiff