sub _get_commit {
my($self, $c) = @_;
+ my $h = $c->req->param('h');
+ my $f = $c->req->param('f');
+ my $m = $c->model('Git');
+
# Either use the provided h(ash) parameter, the f(ile) parameter or just use HEAD.
- my $hash = $c->req->param('h')
- || ($c->req->param('f') ? $c->model('Git')->hash_by_path($c->req->param('f')) : '')
- || $c->model('Git')->head_hash
+ my $hash = ($h =~ /[^a-f0-9]/ ? $m->head_hash($h) : $h)
+ || ($f && $m->hash_by_path($f))
+ || $m->head_hash
# XXX This could definitely use more context.
|| Carp::croak("Couldn't find a hash for the commit object!");
- my $commit = $c->model('Git')->get_object($hash)
- or Carp::croak("Couldn't find a commit object for '$hash'!");
+
+ (my $pd = $m->project_dir( $m->project )) =~ s{/\.git$}();
+ my $commit = $m->get_object($hash)
+ or Carp::croak("Couldn't find a commit object for '$hash' in '$pd'!");
return $commit;
}
$c->stash(
commit => $commit,
info => $c->model('Git')->project_info($c->model('Git')->project),
- log_lines => [$c->model('Git')->list_revs(rev => $commit->sha1, count => 17)],
+ log_lines => [$c->model('Git')->list_revs(
+ sha1 => $commit->sha1, count => Gitalist->config->{paging}{summary}
+ )],
+ refs => $c->model('Git')->references,
heads => [$c->model('Git')->heads],
action => 'summary',
);
|| $c->model('Git')->head_hash
|| die "Couldn't discern the corresponding head.";
+ my $filename = $c->req->param('f') || '';
+
$c->stash(
blob => $c->model('Git')->get_object($h)->content,
head => $c->model('Git')->get_object($hb),
- filename => $c->req->param('f') || '',
+ filename => $filename,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
action => 'blob',
);
$c->forward('View::SyntaxHighlight');
}
+=head2 blobdiff
+
+Exposes a given diff of a blob.
+
+=cut
+
+sub blobdiff : Local {
+ my ( $self, $c ) = @_;
+
+ my $commit = $self->_get_commit($c);
+ my $filename = $c->req->param('f')
+ || croak("No file specified!");
+ my($tree, $patch) = $c->model('Git')->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || '',
+ file => $filename,
+ patch => 1,
+ );
+ $c->stash(
+ commit => $commit,
+ diff => $patch,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ blobs => [$patch->[0]->{diff}],
+ language => 'Diff',
+ action => 'blobdiff',
+ );
+
+ $c->forward('View::SyntaxHighlight');
+}
+
=head2 commit
Exposes a given commit.
my $commit = $self->_get_commit($c);
$c->stash(
commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
+ diff_tree => ($c->model('Git')->diff(commit => $commit))[0],
branches_on => [$c->model('Git')->refs_for($commit->sha1)],
action => 'commit',
);
my ( $self, $c ) = @_;
my $commit = $self->_get_commit($c);
+ my($tree, $patch) = $c->model('Git')->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || '',
+ patch => 1,
+ );
$c->stash(
- commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
- diff => [$c->model('Git')->diff($commit->parent_sha1, $commit->sha1)],
- action => 'commitdiff',
+ commit => $commit,
+ diff_tree => $tree,
+ diff => $patch,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ blobs => [map $_->{diff}, @$patch],
+ language => 'Diff',
+ action => 'commitdiff',
);
+
+ $c->forward('View::SyntaxHighlight');
}
=head2 shortlog
sub shortlog : Local {
my ( $self, $c ) = @_;
- my $commit = $self->_get_commit($c);
- # XXX Needs paging.
+ my $commit = $self->_get_commit($c);
+ my %logargs = (
+ sha1 => $commit->sha1,
+ count => Gitalist->config->{paging}{log},
+ ($c->req->param('f') ? (file => $c->req->param('f')) : ())
+ );
+
+ my $page = $c->req->param('pg') || 0;
+ $logargs{skip} = $c->req->param('pg') * $logargs{count}
+ if $c->req->param('pg');
+
$c->stash(
commit => $commit,
- log_lines => [$c->model('Git')->list_revs(rev => $commit->sha1)],
+ log_lines => [$c->model('Git')->list_revs(%logargs)],
+ refs => $c->model('Git')->references,
action => 'shortlog',
+ page => $page + 1,
);
}
);
}
+sub search : Local {
+ Carp::croak "Not implemented.";
+}
+
+sub search_help : Local {
+ Carp::croak "Not implemented.";
+}
+
=head2 auto
Populate the header and footer. Perhaps not the best location.
sub auto : Private {
my($self, $c) = @_;
- # XXX Temp hack until a decent solution is invented.
- $c->model('Git')->project($c->req->param('p'))
- if $c->req->param('p');
-
# Yes, this is hideous.
$self->header($c);
$self->footer($c);
if(defined $project) {
$c->stash(
- search_text => ( $c->req->param('s') || $c->req->param('searchtext') ),
+ search_text => ( $c->req->param('s') || $c->req->param('searchtext') || ''),
search_hash => ( $c->req->param('hb') || $c->req->param('hashbase')
|| $c->req->param('h') || $c->req->param('hash')
|| 'HEAD' ),
=cut
-sub end : ActionClass('RenderView') {}
+sub end : ActionClass('RenderView') {
+ # Give every view the current HEAD.
+ $_[1]->stash->{HEAD} = $_[1]->model('Git')->head_hash;
+}
=head1 AUTHOR