From: Zachary Stevens <zts@cryptocracy.com>
Date: Mon, 30 Nov 2009 01:01:38 +0000 (+0000)
Subject: Make history action work as per gitweb. This feels pretty messy at the moment - too... 
X-Git-Tag: 0.000000_02~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cce8c9b62cb21d5eff12cb706745ee631f8f79b1;p=catagits%2FGitalist.git

Make history action work as per gitweb. This feels pretty messy at the moment - too much duplication of shortlog.
Navigation links are still broken in this commit.
---

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index c479ee3..f9e94ad 100644
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -6,6 +6,7 @@ BEGIN { extends 'Catalyst::Controller' }
 
 __PACKAGE__->config->{namespace} = '';
 
+use Moose::Autobox;
 use Sys::Hostname ();
 use XML::Atom::Feed;
 use XML::Atom::Entry;
@@ -372,7 +373,18 @@ sub log : Local {
 
 # For legacy support.
 sub history : Local {
-  $_[1]->forward('shortlog');
+    my ( $self, $c ) = @_;
+    $self->shortlog($c);
+    my $project = $c->stash->{Project};
+    my $file = $project->get_object(
+        $project->hash_by_path(
+            $project->head_hash,
+            $c->stash->{filename}
+        )
+    );
+     $c->stash( action => 'history',
+               filetype => $file->type,
+           );
 }
 
 =head2 tree
diff --git a/root/_history.tt2 b/root/_history.tt2
new file mode 100644
index 0000000..83f09e1
--- /dev/null
+++ b/root/_history.tt2
@@ -0,0 +1,46 @@
+<table class='history listing'>
+ <thead>
+  <tr>
+   <th>sha1</th>
+   <th>time</th>
+   <th>author</th>
+   <th>message</th>
+   <th>actions</th>
+  </tr>
+ </thead>
+
+ <tfoot>
+  <tr>
+   <td>sha1</td>
+   <td>time</td>
+   <td>author</td>
+   <td>message</td>
+   <td>actions</td>
+  </tr>
+ </tfoot>
+
+ <tbody>
+ [% FOREACH line IN log_lines %]
+  <tr>
+   <td class='sha1' title='[% line.sha1 %]'>[% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %]</td>
+   <td class='time-since' title='[% line.authored_time %]'>[% time_since(line.authored_time) %]</td>
+   <td class='author'>[% line.author.name | html %]</td>
+   <td>
+     [% short_cmt(line.comment) | html %]
+     [% INCLUDE '_refs.tt2' object = line.0 %]
+   </td>
+   <td class='action-list'>
+   [% IF filetype == 'tree' %]
+     <a href="[% c.uri_for("tree", {h=line.sha1, hb=line.sha1}) %]">tree</a>
+    [% ELSIF filetype == 'blob' %]
+     <a href="[% c.uri_for("blob", {hb=line.sha1, f=filename}) %]">blob</a>
+    [% END %]
+     <a href="[% c.uri_for("commitdiff", {h=line.sha1}) %]">commitdiff</a>
+    [% IF filetype == 'blob' %]
+     <a href="[% c.uri_for("blobdiff", {hb="HEAD", hpb=line.sha1, f=filename}) %]">diff to current</a>
+     [% END %]
+   </td>
+  </tr>
+ [% END %]
+ </tbody>
+</table>
diff --git a/root/_tree.tt2 b/root/_tree.tt2
index 176f36a..a403aa4 100644
--- a/root/_tree.tt2
+++ b/root/_tree.tt2
@@ -25,7 +25,7 @@
    </td>
    <td class='action-list'>
      <a href="[% c.uri_for(theact, {h=item.sha1, hb=commit.sha1, f=fullpath}) %]">[% theact %]</a>
-     <a href="[% c.uri_for('shortlog', {h=item.sha1, hb=commit.sha1, f=fullpath}) %]">history</a>
+     <a href="[% c.uri_for('history', {h=item.sha1, hb=commit.sha1, f=fullpath}) %]">history</a>
      [% IF item.type == 'blob' %]
      <a href="[% c.uri_for('raw', {hb=commit.sha1, f=fullpath}) %]">raw</a>
      [% END %]
diff --git a/root/history.tt2 b/root/history.tt2
new file mode 100644
index 0000000..babb960
--- /dev/null
+++ b/root/history.tt2
@@ -0,0 +1,7 @@
+[% INCLUDE 'nav/actions.tt2' object = commit %]
+
+[%
+  INCLUDE '_log_pager.tt2';
+  INCLUDE '_history.tt2';
+  INCLUDE '_log_pager.tt2';
+%]
diff --git a/root/summary.tt2 b/root/summary.tt2
index 7b6adb4..ce0f77a 100644
--- a/root/summary.tt2
+++ b/root/summary.tt2
@@ -1,4 +1,4 @@
-[% PROCESS 'nav/actions.tt2' object = head %]
+[% PROCESS 'nav/actions.tt2' object = commit %]
 
 <div class='summary'>
 <!-- <div id='stats'>