Migrated blob to new model, + fixes for some legacy URI fails.

[catagits/Gitalist.git] / lib / Gitalist / Controller / Root.pm

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index 9189f85..32e7d7c 100644 (file)
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -160,19 +160,20 @@ The blob action i.e the contents of a file.
 
 sub blob : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $h  = $c->req->param('h')
-       || $c->model()->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()->head_hash
+       || $project->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),
+    blob     => $project->get_object($h)->contents,
+    head     => $project->get_object($hb),
     filename => $filename,
     # XXX Hack hack hack, see View::SyntaxHighlight
     language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
@@ -190,13 +191,13 @@ Exposes a given diff of a blob.
 
 sub blobdiff : Local {
   my ( $self, $c ) = @_;
-
-  my $commit = $self->_get_commit($c);
+  $c->stash(current_model => 'GitRepos');
+  my $commit = $self->_get_commit($c, $c->req->param('hb'));
   my $filename = $c->req->param('f')
               || croak("No file specified!");
-  my($tree, $patch) = $c->model()->diff(
+  my($tree, $patch) = $c->stash->{Project}->diff(
     commit => $commit,
-    parent => $c->req->param('hp') || '',
+    parent => $c->req->param('hpb') || '',
     file   => $filename,
     patch  => 1,
   );
@@ -220,12 +221,13 @@ Exposes a given commit.
 
 sub commit : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c);
   $c->stash(
       commit      => $commit,
-      diff_tree   => ($c->model()->diff(commit => $commit))[0],
-      refs      => $c->model()->references,
+      diff_tree   => ($project->diff(commit => $commit))[0],
+      refs      => $project->references,
       action      => 'commit',
   );
 }
@@ -238,11 +240,11 @@ Exposes a given diff of a commit.
 
 sub commitdiff : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
   my $commit = $self->_get_commit($c);
-  my($tree, $patch) = $c->model()->diff(
+  my($tree, $patch) = $c->stash->{Project}->diff(
       commit => $commit,
-      parent => $c->req->param('hp') || '',
+      parent => $c->req->param('hp') || undef,
       patch  => 1,
   );
   $c->stash(
@@ -306,14 +308,15 @@ The tree of a given commit.
 
 sub tree : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c, $c->req->param('hb'));
-  my $tree   = $c->model()->get_object($c->req->param('h') || $commit->tree_sha1);
+  my $tree   = $project->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)],
+      tree_list => [$project->list_tree($tree->sha1)],
          path      => $c->req->param('f') || '',
       action    => 'tree',
   );
@@ -327,8 +330,8 @@ Expose the local reflog. This may go away.
 
 sub reflog : Local {
   my ( $self, $c ) = @_;
-
-  my @log = $c->model()->reflog(
+  $c->stash(current_model => 'GitRepos');
+  my @log = $c->stash->{Project}->reflog(
       '--since=yesterday'
   );
 
@@ -340,7 +343,8 @@ sub reflog : Local {
 
 sub search : Local {
   my($self, $c) = @_;
-
+  $c->stash(current_action => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit  = $self->_get_commit($c);
   # Lifted from /shortlog.
   my %logargs = (
@@ -356,16 +360,64 @@ sub search : Local {
 
   $c->stash(
       commit  => $commit,
-      results => [$c->model()->list_revs(%logargs)],
+      results => [$project->list_revs(%logargs)],
       action  => 'search',
          # This could be added - page      => $page,
   );
 }
 
 sub search_help : Local {
+    # FIXME - implement search_help
+    Carp::croak "Not implemented.";
+}
+
+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 {
+    # FIXME - implement patches
+    Carp::croak "Not implemented.";
+}
+
+sub patches : Local {
+    # FIXME - implement patches
+    Carp::croak "Not implemented.";
+}
+
+sub snapshot : Local {
+    # FIXME - implement snapshot
+    Carp::croak "Not implemented.";
+}
+
+sub history : Local {
+    # FIXME - implement history
+    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.