From eb9e660f5bf62f6914b83ec2e17a652d035ab392 Mon Sep 17 00:00:00 2001
From: Wim Rijnders <wrijnders@gmail.com>
Date: Tue, 4 Dec 2012 07:06:43 +0100
Subject: [PATCH] Code for loading repo in TreeController.

---
 src/GitList/Controller/TreeController.php | 33 ++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php
index 9d0efa4..97a10a6 100644
--- a/src/GitList/Controller/TreeController.php
+++ b/src/GitList/Controller/TreeController.php
@@ -75,20 +75,16 @@ echo "searc\n";
           ->assert('branch', '[\w-._\/]+')
           ->bind('search');
 
-        $route->get('{repo}/{branch}/', function($repo, $branch) use ($app, $treeController) {
-            return $treeController($repo, $branch);
-        })->assert('repo', $app['util.routing']->getRepositoryRegex())
-          ->assert('branch', '[\w-._\/]+')
-          ->bind('branch');
-
-        $route->get('{repo}/', function($repo) use ($app, $treeController) {
-            return $treeController($repo);
-        })->assert('repo', $app['util.routing']->getRepositoryRegex())
-          ->bind('repository');
 
+        # WRI: Changed order of this and next statement, because order
+        # appears to be important, and the other statement got precedence
         $route->get('{repo}/{format}ball/{branch}', function($repo, $format, $branch) use ($app) {
-            $repository = $app['git']->getRepositoryCached($app['git.repos'], $repo);
-            $path = $repository->getPath();
+echo "tarball\n";
+
+            $repo_item = $app['git']->getRepositoryCached($app['git.repos'], $repo);
+            $path = $repo_item->getPath();
+
+            $repository = $app['git']->getRepository($path );
 
             $tree = $repository->getBranchTree($branch);
 
@@ -120,6 +116,19 @@ echo "searc\n";
           ->assert('branch', '[\w-._\/]+')
           ->bind('archive');
 
+
+        $route->get('{repo}/{branch}/', function($repo, $branch) use ($app, $treeController) {
+            return $treeController($repo, $branch);
+        })->assert('repo', $app['util.routing']->getRepositoryRegex())
+          ->assert('branch', '[\w-._\/]+')
+          ->bind('branch');
+
+        $route->get('{repo}/', function($repo) use ($app, $treeController) {
+            return $treeController($repo);
+        })->assert('repo', $app['util.routing']->getRepositoryRegex())
+          ->bind('repository');
+
+
         return $route;
     }
 }