From 3dbae6272a9f239499038f069f6472dfceb5e73e Mon Sep 17 00:00:00 2001
From: Loic d'Anterroches <titoo@users.sourceforge.net>
Date: Sun, 27 Jul 2008 21:38:49 +0200
Subject: [PATCH] Added smooth handling of bad files and commits.

Now simply redirect to the root of the first available branch.
---
 src/IDF/Git.php          |  3 ---
 src/IDF/Views/Source.php | 26 +++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/IDF/Git.php b/src/IDF/Git.php
index 63c4f10..5c460c1 100644
--- a/src/IDF/Git.php
+++ b/src/IDF/Git.php
@@ -66,9 +66,6 @@ class IDF_Git
      */
     public function filesAtCommit($commit='HEAD', $folder='')
     {
-        if ('commit' != $this->testHash($commit)) {
-            throw new Exception(sprintf(__('Not a valid commit: %s.'), $commit));
-        }
         // now we grab the info about this commit including its tree.
         $co = $this->getCommit($commit);
         if ($folder) {
diff --git a/src/IDF/Views/Source.php b/src/IDF/Views/Source.php
index a276f40..8b41c9e 100644
--- a/src/IDF/Views/Source.php
+++ b/src/IDF/Views/Source.php
@@ -55,6 +55,13 @@ class IDF_Views_Source
         $git = new IDF_Git(Pluf::f('git_repository'));
         $commit = $match[2];
         $branches = $git->getBranches();
+        if ('commit' != $git->testHash($commit)) {
+            // Redirect to the first branch
+            $url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase',
+                                            array($request->project->shortname,
+                                                  $branches[0]));
+            return new Pluf_HTTP_Response_Redirect($url);
+        }
         $res = $git->filesAtCommit($commit);
         $cobject = $git->getCommit($commit);
         $tree_in = in_array($commit, $branches);
@@ -75,18 +82,31 @@ class IDF_Views_Source
     {
         $title = sprintf('%s Git Source Tree', (string) $request->project);
         $git = new IDF_Git(Pluf::f('git_repository'));
+        $branches = $git->getBranches();
         $commit = $match[2];
+        if ('commit' != $git->testHash($commit)) {
+            // Redirect to the first branch
+            $url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase',
+                                            array($request->project->shortname,
+                                                  $branches[0]));
+            return new Pluf_HTTP_Response_Redirect($url);
+        }
         $request_file = $match[3];
         $request_file_info = $git->getFileInfo($request_file, $commit);
-        if (!$request_file_info) throw new Pluf_HTTP_Error404();
+        if (!$request_file_info) {
+            // Redirect to the first branch
+            $url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase',
+                                            array($request->project->shortname,
+                                                  $branches[0]));
+            return new Pluf_HTTP_Response_Redirect($url);
+        }
         if ($request_file_info->type != 'tree') {
             return new Pluf_HTTP_Response($git->getBlob($request_file_info->hash),
                                           'application/octet-stream');
         }
         $bc = self::makeBreadCrumb($request->project, $commit, $request_file_info->file);
         $page_title = $bc.' - '.$title;
-        $branches = $git->getBranches();
-        $cobject = $git->getCommit();
+        $cobject = $git->getCommit($commit);
         $tree_in = in_array($commit, $branches);
         $res = $git->filesAtCommit($commit, $request_file);
         // try to find the previous level if it exists.