=cut
use IO::Capture::Stdout;
-use File::Slurp qw(slurp);
+
+=head2 run_gitweb
+
+The C<gitweb> shim. It should now only be explicitly accessible by
+modifying the URL.
+
+=cut
sub run_gitweb {
my ( $self, $c ) = @_;
$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, $haveh) = @_;
+
+ my $h = $haveh || $c->req->param('h');
+ my $f = $c->req->param('f');
+ 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)
+ || ($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 $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;
+}
+
+=head2 index
+
+Provides the project listing.
+
+=cut
+
sub index :Path :Args(0) {
my ( $self, $c ) = @_;
-
+ $c->stash(current_model => 'GitRepos');
# Leave actions up to gitweb at this point.
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 ". $c->model->repo_dir;
}
$c->stash(
);
}
+=head2 summary
+
+A summary of what's happening in the repo.
+
+=cut
+
+sub summary : Local {
+ my ( $self, $c ) = @_;
+
+ my $commit = $self->_get_commit($c);
+ $c->stash(
+ commit => $commit,
+ 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',
+ );
+}
+
+=head2 heads
+
+The current list of heads (aka branches) in the repo.
+
+=cut
+
+sub heads : Local {
+ my ( $self, $c ) = @_;
+
+ $c->stash(
+ commit => $self->_get_commit($c),
+ heads => [$c->model()->heads],
+ action => 'heads',
+ );
+}
+
+=head2 blob
+
+The blob action i.e the contents of a file.
+
+=cut
+
sub blob : Local {
my ( $self, $c ) = @_;
- my $git = $c->model('Git');
- my $req = $c->req;
- my $proj = $req->param('p');
- my $filename = $req->param('f') || $req->param('filename');
- my $hash = $req->param('hb') || $git->get_head_hash($proj);
- my $filehash = $req->param('h') || $git->get_hash_by_path($proj, $hash, $filename, 'blob');
-
- my $blob = $git->run_cmd('cat-file' => blob => $filehash);
+ my $h = $c->req->param('h')
+ || $c->model()->hash_by_path($c->req->param('f'))
+ || die "No file or sha1 provided.";
+ my $hb = $c->req->param('hb')
+ || $c->model()->head_hash
+ || die "Couldn't discern the corresponding head.";
+
+ my $filename = $c->req->param('f') || '';
+
+ $c->stash(
+ 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' : ''),
+ 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()->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.
+
+=cut
+
+sub commit : Local {
+ my ( $self, $c ) = @_;
+ my $commit = $self->_get_commit($c);
$c->stash(
- blob => $blob,
- action => 'blob',
+ commit => $commit,
+ diff_tree => ($c->model()->diff(commit => $commit))[0],
+ branches_on => [$c->model()->refs_for($commit->sha1)],
+ action => 'commit',
);
}
+=head2 commitdiff
+
+Exposes a given diff of a commit.
+
+=cut
+
+sub commitdiff : Local {
+ my ( $self, $c ) = @_;
+
+ my $commit = $self->_get_commit($c);
+ my($tree, $patch) = $c->model()->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || '',
+ patch => 1,
+ );
+ $c->stash(
+ 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
+
+Expose an abbreviated log of a given sha1.
+
+=cut
+
+sub shortlog : Local {
+ my ( $self, $c ) = @_;
+
+ 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()->list_revs(%logargs)],
+ refs => $c->model()->references,
+ action => 'shortlog',
+ page => $page,
+ );
+}
+
+=head2 log
+
+Calls shortlog internally. Perhaps that should be reversed ...
+
+=cut
+sub log : Local {
+ $_[0]->shortlog($_[1]);
+ $_[1]->stash->{action} = 'log';
+}
+
+=head2 tree
+
+The tree of a given commit.
+
+=cut
+
+sub tree : Local {
+ my ( $self, $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 => $tree,
+ tree_list => [$c->model()->list_tree($tree->sha1)],
+ path => $c->req->param('f') || '',
+ action => 'tree',
+ );
+}
+
+=head2 reflog
+
+Expose the local reflog. This may go away.
+
+=cut
+
sub reflog : Local {
my ( $self, $c ) = @_;
- my @log = $c->model('Git')->reflog(
- # XXX The project parameter should probably be passed into the Model.
- $c->req->param('p'),
+ 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.
+
+=cut
+
sub auto : Private {
my($self, $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
: '';
return %res;
}
+
=head2 end
Attempt to render a view, if needed.
=cut
-sub end : ActionClass('RenderView') {}
+sub end : ActionClass('RenderView') {
+ my ($self, $c) = @_;
+ # Give project views the current HEAD.
+ if ($c->stash->{project}) {
+ $c->stash->{HEAD} = $c->model()->head_hash;
+ }
+
+ # XXX Move this into a plugin!
+ use DateTime::Format::Human::Duration;
+ $c->stash->{time_since} = sub {
+ my($dt, $now) = ($self, DateTime->now);
+
+ my($age) = $dt < (DateTime->now - DateTime::Duration->new(days=>12))
+ ? $dt->ymd
+ : DateTime::Format::Human::Duration->new->format_duration($now - $dt)
+ =~ /^(?:.*?weeks?, )?(\d+ [^\d]+)(?:,|$) /;
+
+ return $age;
+ };
+}
=head1 AUTHOR
-Dan Brook,,,
+Dan Brook
=head1 LICENSE
projects / catagits/Gitalist.git / blobdiff