X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=da1a9cdde0f959d8ac76e69e05e7da29d926be11;hb=deb6344b79370d2dda7dc41ce1aa11ac03c6c3e2;hp=1e45c82384378d4a7da14b1439927f42c573cc53;hpb=2247133f2207fe7c33ed2af4c1f949b336cdf946;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index 1e45c82..da1a9cd 100644
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -46,17 +46,39 @@ sub run_gitweb {
       $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('Git');
+
+  # 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.
@@ -72,7 +94,7 @@ sub index :Path :Args(0) {
 
   my $list = $c->model('Git')->list_projects;
   unless(@$list) {
-    die "No projects found";
+    die "No projects found in ".Gitalist->config->{repodir};
   }
 
   $c->stash(
@@ -91,11 +113,14 @@ A summary of what's happening in the repo.
 sub summary : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $c->model('Git')->get_object($c->model('Git')->head_hash);
+  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(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',
   );
@@ -111,7 +136,7 @@ sub heads : Local {
   my ( $self, $c ) = @_;
 
   $c->stash(
-    commit => $c->model('Git')->get_object($c->model('Git')->head_hash),
+    commit => $self->_get_commit($c),
     heads  => [$c->model('Git')->heads],
     action => 'heads',
   );
@@ -133,33 +158,48 @@ sub blob : Local {
        || $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 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_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(
-      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
@@ -171,10 +211,10 @@ Exposes a given commit.
 sub commit : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $c->model('Git')->get_object($c->req->param('h'));
+  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',
   );
@@ -189,13 +229,23 @@ Exposes a given diff of a commit.
 sub commitdiff : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $c->model('Git')->get_object($c->req->param('h'));
+  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->sha1, $commit->parent_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
@@ -207,12 +257,23 @@ Expose an abbreviated log of a given sha1.
 sub shortlog : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $c->model('Git')->get_object($c->req->param('h'));
-  # 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,
   );
 }
 
@@ -235,16 +296,45 @@ The tree of a given commit.
 sub tree : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $c->model('Git')->get_object($c->req->param('h'));
+  my $commit = $self->_get_commit($c, $c->req->param('hb'));
+  my $tree   = $c->model('Git')->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')),
-      list_tree => [$c->model('Git')->list_tree($commit->sha1)],
+      tree      => $tree,
+      tree_list => [$c->model('Git')->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(
+      '--since=yesterday'
+  );
+
+  $c->stash(
+      log    => \@log,
+      action => 'reflog',
+  );
+}
+
+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.
@@ -254,10 +344,6 @@ 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);
@@ -346,7 +432,7 @@ sub header {
 
   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' ),
@@ -445,7 +531,10 @@ Attempt to render a view, if needed.
 
 =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