=head2 run_gitweb
-The main shim around C<gitweb.pm>.
+The C<gitweb> shim. It should now only be explicitly accessible by
+modifying the URL.
=cut
$action->();
};
$capture->stop();
-
+
use Data::Dumper;
die Dumper($@)
if $@;
-
+
my $output = join '', $capture->read;
$c->stash->{gitweb_output} = $output;
$c->stash->{template} = 'gitweb.tt2';
}
sub _get_commit {
- my($self, $c) = @_;
+ my($self, $c, $haveh) = @_;
- my $h = $c->req->param('h');
+ my $h = $haveh || $c->req->param('h') || '';
my $f = $c->req->param('f');
- my $m = $c->model('Git');
+ my $m = $c->model();
# Either use the provided h(ash) parameter, the f(ile) parameter or just use HEAD.
my $hash = ($h =~ /[^a-f0-9]/ ? $m->head_hash($h) : $h)
# XXX This could definitely use more context.
|| Carp::croak("Couldn't find a hash for the commit object!");
-
+
(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 $self->run_gitweb($c)
if $c->req->param('a');
- my $list = $c->model('Git')->list_projects;
+ my $list = $c->model()->list_projects;
unless(@$list) {
- die "No projects found";
+ die "No projects found in ".Gitalist->config->{repodir};
}
$c->stash(
my $commit = $self->_get_commit($c);
$c->stash(
commit => $commit,
- info => $c->model('Git')->project_info($c->model('Git')->project),
- log_lines => [$c->model('Git')->list_revs(sha1 => $commit->sha1, count => 16)],
- refs => $c->model('Git')->references,
- heads => [$c->model('Git')->heads],
- HEAD => $c->model('Git')->head_hash,
+ info => $c->model()->project_info($c->model()->project),
+ log_lines => [$c->model()->list_revs(
+ sha1 => $commit->sha1, count => Gitalist->config->{paging}{summary}
+ )],
+ refs => $c->model()->references,
+ heads => [$c->model()->heads],
action => 'summary',
);
}
$c->stash(
commit => $self->_get_commit($c),
- heads => [$c->model('Git')->heads],
- HEAD => $c->model('Git')->head_hash,
+ heads => [$c->model()->heads],
action => 'heads',
);
}
my ( $self, $c ) = @_;
my $h = $c->req->param('h')
- || $c->model('Git')->hash_by_path($c->req->param('f'))
+ || $c->model()->hash_by_path($c->req->param('f'))
|| die "No file or sha1 provided.";
my $hb = $c->req->param('hb')
- || $c->model('Git')->head_hash
+ || $c->model()->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),
+ blob => $c->model()->get_object($h)->content,
+ head => $c->model()->get_object($hb),
filename => $filename,
# XXX Hack hack hack, see View::SyntaxHighlight
language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
my $commit = $self->_get_commit($c);
my $filename = $c->req->param('f')
|| croak("No file specified!");
- my @diff = $c->model('Git')->diff(
- $commit->parent_sha1, $commit->sha1, '--', $filename
+ my($tree, $patch) = $c->model()->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || '',
+ file => $filename,
+ patch => 1,
);
$c->stash(
commit => $commit,
- diff => \@diff,
+ diff => $patch,
# XXX Hack hack hack, see View::SyntaxHighlight
- blobs => [$diff[0]->{diff}],
+ blobs => [$patch->[0]->{diff}],
language => 'Diff',
action => 'blobdiff',
);
my $commit = $self->_get_commit($c);
$c->stash(
commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
- branches_on => [$c->model('Git')->refs_for($commit->sha1)],
+ diff_tree => ($c->model()->diff(commit => $commit))[0],
+ branches_on => [$c->model()->refs_for($commit->sha1)],
action => 'commit',
);
}
my ( $self, $c ) = @_;
my $commit = $self->_get_commit($c);
- my @difflist = $c->model('Git')->diff($commit->parent_sha1, $commit->sha1);
+ my($tree, $patch) = $c->model()->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || '',
+ patch => 1,
+ );
$c->stash(
commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
- diff => \@difflist,
+ diff_tree => $tree,
+ diff => $patch,
# XXX Hack hack hack, see View::SyntaxHighlight
- blobs => [map $_->{diff}, @difflist],
+ blobs => [map $_->{diff}, @$patch],
language => 'Diff',
action => 'commitdiff',
);
my ( $self, $c ) = @_;
my $commit = $self->_get_commit($c);
- my @logargs = (
- sha1 => $commit->sha1,
+ my %logargs = (
+ sha1 => $commit->sha1,
+ count => Gitalist->config->{paging}{log},
($c->req->param('f') ? (file => $c->req->param('f')) : ())
);
- # XXX Needs paging.
+
+ 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(@logargs)],
- refs => $c->model('Git')->references,
+ log_lines => [$c->model()->list_revs(%logargs)],
+ refs => $c->model()->references,
action => 'shortlog',
+ page => $page,
);
}
sub tree : Local {
my ( $self, $c ) = @_;
- my $commit = $self->_get_commit($c);
+ my $commit = $self->_get_commit($c, $c->req->param('hb'));
+ my $tree = $c->model()->get_object($c->req->param('h') || $commit->tree_sha1);
$c->stash(
# XXX Useful defaults needed ...
commit => $commit,
- tree => $c->model('Git')->get_object($c->req->param('hb')),
- tree_list => [$c->model('Git')->list_tree($commit->sha1)],
+ tree => $tree,
+ tree_list => [$c->model()->list_tree($tree->sha1)],
+ path => $c->req->param('f') || '',
action => 'tree',
);
}
sub reflog : Local {
my ( $self, $c ) = @_;
- my @log = $c->model('Git')->reflog(
+ my @log = $c->model()->reflog(
'--since=yesterday'
);
);
}
+sub search : Local {
+ my($self, $c) = @_;
+
+ my $commit = $self->_get_commit($c);
+ # Lifted from /shortlog.
+ my %logargs = (
+ sha1 => $commit->sha1,
+ count => Gitalist->config->{paging}{log},
+ ($c->req->param('f') ? (file => $c->req->param('f')) : ()),
+ search => {
+ type => $c->req->param('type'),
+ text => $c->req->param('text'),
+ regexp => $c->req->param('regexp') || 0,
+ }
+ );
+
+ $c->stash(
+ commit => $commit,
+ results => [$c->model()->list_revs(%logargs)],
+ action => 'search',
+ # This could be added - page => $page,
+ );
+}
+
+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);
}
$c->stash->{version} = $c->config->{version};
- $c->stash->{git_version} = $c->model('Git')->run_cmd('--version');
+ $c->stash->{git_version} = $c->model()->run_cmd('--version');
$c->stash->{title} = $title;
#$c->stash->{baseurl} = $ENV{PATH_INFO} && uri_escape($base_url);
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' ),
my $project = $c->req->param('project') || $c->req->param('p');
if(defined $project) {
(my $pstr = $project) =~ s[/?\.git$][];
- my $descr = $c->model('Git')->project_info($project)->{description};
+ my $descr = $c->model()->project_info($project)->{description};
$c->stash->{project_description} = defined $descr
? $descr
: '';
=cut
-sub end : ActionClass('RenderView') {}
+sub end : ActionClass('RenderView') {
+ # Give every view the current HEAD.
+ $_[1]->stash->{HEAD} = $_[1]->model()->head_hash;
+
+ # XXX This should be in a plugin.
+ $_[1]->stash->{time_since} = sub {
+ return age_string(time - $_[0]->epoch);
+ };
+}
+
+# XXX Ripped straight from gitweb.pm
+# convert age in seconds to "nn units ago" string
+sub age_string {
+ my $age = shift;
+ my $age_str;
+
+ if ($age > 60*60*24*365*2) {
+ $age_str = (int $age/60/60/24/365);
+ $age_str .= " years ago";
+ } elsif ($age > 60*60*24*(365/12)*2) {
+ $age_str = int $age/60/60/24/(365/12);
+ $age_str .= " months ago";
+ } elsif ($age > 60*60*24*7*2) {
+ $age_str = int $age/60/60/24/7;
+ $age_str .= " weeks ago";
+ } elsif ($age > 60*60*24*2) {
+ $age_str = int $age/60/60/24;
+ $age_str .= " days ago";
+ } elsif ($age > 60*60*2) {
+ $age_str = int $age/60/60;
+ $age_str .= " hours ago";
+ } elsif ($age > 60*2) {
+ $age_str = int $age/60;
+ $age_str .= " min ago";
+ } elsif ($age > 2) {
+ $age_str = int $age;
+ $age_str .= " sec ago";
+ } else {
+ $age_str .= " right now";
+ }
+ return $age_str;
+}
=head1 AUTHOR
-Dan Brook,,,
+Dan Brook
=head1 LICENSE