=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_object {
+ my($self, $c, $haveh) = @_;
+
+ my $h = $haveh || $c->req->param('h') || '';
+ my $f = $c->req->param('f');
+
+ my $m = $c->stash->{Project};
+ my $pd = $m->path;
+
+ # 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 $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.
sub index :Path :Args(0) {
my ( $self, $c ) = @_;
- # Leave actions up to gitweb at this point.
- return $self->run_gitweb($c)
+ $c->detach($c->req->param('a'))
if $c->req->param('a');
- my $list = $c->model('Git')->list_projects;
- unless(@$list) {
- die "No projects found";
+ my @list = @{ $c->model()->projects };
+ die 'No projects found in '. $c->model->repo_dir
+ unless @list;
+
+ my $search = $c->req->param('s') || '';
+ if($search) {
+ @list = grep {
+ index($_->name, $search) > -1
+ or ( $_->description !~ /^Unnamed repository/ and index($_->description, $search) > -1 )
+ } @list
}
$c->stash(
- searchtext => $c->req->param('searchtext') || '',
- projects => $list,
- action => 'index',
+ search_text => $search,
+ projects => \@list,
+ action => 'index',
);
}
sub summary : Local {
my ( $self, $c ) = @_;
-
- my $commit = $c->model('Git')->get_object($c->model('Git')->head_hash);
+ my $project = $c->stash->{Project};
+ $c->detach('error_404') unless $project;
+ my $commit = $self->_get_object($c);
+ my @heads = @{$project->heads};
+ my $maxitems = Gitalist->config->{paging}{summary} || 10;
$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)],
- heads => [$c->model('Git')->heads],
+# info => $project->info,
+ log_lines => [$project->list_revs(
+ sha1 => $commit->sha1,
+ count => $maxitems,
+ )],
+ refs => $project->references,
+ heads => [ @heads[0 .. ($#heads < $maxitems ? $#heads : $maxitems)] ],
action => 'summary',
);
}
sub heads : Local {
my ( $self, $c ) = @_;
-
+ my $project = $c->stash->{Project};
$c->stash(
- commit => $c->model('Git')->get_object($c->model('Git')->head_hash),
- heads => [$c->model('Git')->heads],
+ commit => $self->_get_object($c),
+ heads => $project->heads,
action => 'heads',
);
}
sub blob : Local {
my ( $self, $c ) = @_;
-
+ my $project = $c->stash->{Project};
my $h = $c->req->param('h')
- || $c->model('Git')->hash_by_path($c->req->param('f'))
+ || $project->hash_by_path($c->req->param('hb'), $c->req->param('f'))
|| die "No file or sha1 provided.";
my $hb = $c->req->param('hb')
- || $c->model('Git')->head_hash
+ || $project->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') || '',
+ blob => $project->get_object($h)->content,
+ head => $project->get_object($hb),
+ filename => $filename,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
action => 'blob',
);
$c->forward('View::SyntaxHighlight');
}
-=head2 reflog
+=head2 blobdiff
-Expose the local reflog. This may go away.
+Exposes a given diff of a blob.
=cut
-sub reflog : Local {
+sub blobdiff : Local {
my ( $self, $c ) = @_;
-
- my @log = $c->model('Git')->reflog(
- '--since=yesterday'
+ my $commit = $self->_get_object($c, $c->req->param('hb'));
+ my $filename = $c->req->param('f')
+ || croak("No file specified!");
+ my($tree, $patch) = $c->stash->{Project}->diff(
+ commit => $commit,
+ parent => $c->req->param('hpb') || '',
+ file => $filename,
+ patch => 1,
);
-
$c->stash(
- log => \@log,
- action => 'reflog',
+ 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
sub commit : Local {
my ( $self, $c ) = @_;
-
- my $commit = $c->model('Git')->get_object($c->req->param('h'));
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($c);
$c->stash(
commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
- branches_on => [$c->model('Git')->refs_for($commit->sha1)],
+ diff_tree => ($project->diff(commit => $commit))[0],
+ refs => $project->references,
action => 'commit',
);
}
+=head2 commitdiff
+
+Exposes a given diff of a commit.
+
+=cut
+
+sub commitdiff : Local {
+ my ( $self, $c ) = @_;
+ my $commit = $self->_get_object($c);
+ my($tree, $patch) = $c->stash->{Project}->diff(
+ commit => $commit,
+ parent => $c->req->param('hp') || undef,
+ 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.
sub shortlog : Local {
my ( $self, $c ) = @_;
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($c);
+ my %logargs = (
+ sha1 => $commit->sha1,
+ count => Gitalist->config->{paging}{log} || 25,
+ ($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');
- my $commit = $c->model('Git')->get_object($c->req->param('h'));
- # XXX Needs paging.
$c->stash(
commit => $commit,
- log_lines => [$c->model('Git')->list_revs(rev => $commit->sha1)],
+ log_lines => [$project->list_revs(%logargs)],
+ refs => $project->references,
action => 'shortlog',
+ page => $page,
);
}
sub tree : Local {
my ( $self, $c ) = @_;
-
- my $commit = $c->model('Git')->get_object($c->req->param('h'));
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($c, $c->req->param('hb'));
+ my $tree = $self->_get_object($c, $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')),
- list_tree => [$c->model('Git')->list_tree($commit->sha1)],
+ tree => $tree,
+ tree_list => [$project->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->stash->{Project}->reflog(
+ '--since=yesterday'
+ );
+
+ $c->stash(
+ log => \@log,
+ action => 'reflog',
+ );
+}
+
+sub search : Local {
+ my($self, $c) = @_;
+ $c->stash(current_action => 'GitRepos');
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($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 => [$project->list_revs(%logargs)],
+ action => 'search',
+ # This could be added - page => $page,
+ );
+}
+
+sub search_help : Local {
+ my ($self, $c) = @_;
+ $c->stash(template => 'search_help.tt2');
+}
+
+sub atom : Local {
+ # FIXME - implement atom
+ Carp::croak "Not implemented.";
+}
+
+sub rss : Local {
+ # FIXME - implement rss
+ Carp::croak "Not implemented.";
+}
+
+sub blobdiff_plain : Local {
+ # FIXME - implement blobdiff_plain
+ Carp::croak "Not implemented.";
+}
+
+sub blob_plain : Local {
+ # FIXME - implement blobdiff_plain
+ Carp::croak "Not implemented.";
+}
+
+sub patch : Local {
+ my ($self, $c) = @_;
+ $c->detach('patches', [1]);
+}
+
+sub patches : Local {
+ my ($self, $c, $count) = @_;
+ $count ||= Gitalist->config->{patches}{max};
+ my $commit = $self->_get_object($c);
+ my $parent = $c->req->param('hp') || undef;
+ my $patch = $commit->patch( $parent, $count );
+ $c->response->body($patch);
+ $c->response->content_type('text/plain');
+ $c->response->status(200);
+}
+
+sub snapshot : Local {
+ # FIXME - implement snapshot
+ Carp::croak "Not implemented.";
+}
+
+sub commitdiff_plain : Local {
+ # FIXME - implement commitdiff_plain
+ Carp::croak "Not implemented.";
+}
+
=head2 auto
Populate the header and footer. Perhaps not the best location.
=cut
sub auto : Private {
- my($self, $c) = @_;
+ 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');
+ # XXX Move these to a plugin!
+ $c->stash(
+ time_since => sub {
+ return 'never' unless $_[0];
+ return age_string(time - $_[0]->epoch);
+ },
+ short_cmt => sub {
+ my $cmt = shift;
+ my($line) = split /\n/, $cmt;
+ $line =~ s/^(.{70,80}\b).*/$1 …/;
+ return $line;
+ },
+ abridged_description => sub {
+ join(' ', grep { defined } (split / /, shift)[0..10]);
+ },
+ );
- # Yes, this is hideous.
- $self->header($c);
- $self->footer($c);
+ # Yes, this is hideous.
+ $self->header($c);
+ $self->footer($c);
}
# XXX This could probably be dropped altogether.
}
}
- $c->stash->{version} = $c->config->{version};
- $c->stash->{git_version} = $c->model('Git')->run_cmd('--version');
+ $c->stash->{version} = $Gitalist::VERSION;
+ # check git's version by running it on the first project in the list.
$c->stash->{title} = $title;
- #$c->stash->{baseurl} = $ENV{PATH_INFO} && uri_escape($base_url);
$c->stash->{stylesheet} = $c->config->{stylesheet} || 'gitweb.css';
$c->stash->{project} = $project;
home_link_str => $c->config->{home_link_str},
);
- if(defined $project) {
- $c->stash(
- 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' ),
+ if (defined $project) {
+ eval {
+ $c->stash(Project => $c->model('GitRepos')->project($project));
+ };
+ if ($@) {
+ $c->detach('error_404');
+ }
+ $c->stash(
+ 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 $a_project = $c->stash->{Project} || $c->model()->projects->[0];
+ $c->stash->{git_version} = $a_project->run_cmd('--version');
}
# Formally git_footer_html
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};
- $c->stash->{project_description} = defined $descr
- ? $descr
- : '';
+ my $descr = $c->stash->{project_description}
+ = $c->stash->{Project} ? $c->stash->{Project}->description : '';
my %href_params = $self->feed_info($c);
if (!%href_params) {
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->stash->{Project}->head_hash;
+ }
+}
+
+sub error_404 :Private {
+ my ($self, $c) = @_;
+ $c->response->status(404);
+ $c->stash(
+ title => 'Page not found',
+ content => 'Page not found',
+ );
+}
+
+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
projects / catagits/Gitalist.git / blobdiff