--- a/TODO.txt
+++ b/TODO.txt
@@ -1,3 +1,4 @@
+[ ] Get rid of all the mocking in the controller tests, or at least clean it up
 [ ] Nag project owners with no commits to the mainline repos after a week or two
 [ ] gitk-style branch view
 [ ] project homepage is an editable wiki-ish page

--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,9 +6,7 @@ class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   include ExceptionNotifiable
   
-  rescue_from(ActiveRecord::RecordNotFound) do |e| 
-    render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
-  end
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_not_found
   
   protected
     def require_user_has_ssh_keys
@@ -22,4 +20,8 @@ class ApplicationController < ActionController::Base
     def find_project
       @project = Project.find_by_slug!(params[:project_id])
     end
+    
+    def render_not_found
+      render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
+    end
 end

--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -5,9 +5,8 @@ class BrowseController < ApplicationController
   LOGS_PER_PAGE = 30
   
   def index
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
-    @commits = @git.log(LOGS_PER_PAGE)
-    @tags_per_sha = @git.tags_by_sha
+    @git = @repository.git
+    @commits = @git.commits(@repository.head_candidate.name, LOGS_PER_PAGE)
     # TODO: Patch rails to keep track of what it responds to so we can DRY this up
     @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
     respond_to do |format|
@@ -17,44 +16,44 @@ class BrowseController < ApplicationController
   end
   
   def tree
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)   
-    @tree = @git.tree(params[:sha])
+    @git = @repository.git
+    @commit = @git.commit(params[:sha])
+    path = params[:path].blank? ? [] : ["#{params[:path].join("/")}/"] # FIXME: meh, this sux
+    @tree = @git.tree(@commit.tree.id, path)
   end
   
   def commit
     @diffmode = params[:diffmode] == "sidebyside" ? "sidebyside" : "inline"
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @git = @repository.git
     @commit = @git.commit(params[:sha])
-    if @commit.parent
-      @diff = @git.diff(@commit.parent.sha || "", @commit.sha)
-    else
-      # initial commit, link to the initial tree instead
-      @diff = nil
-    end
-    @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.sha})
+    @diff = @commit.diffs
+    @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id})
   end
   
   def diff
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @git = @repository.git
     @diff = @git.diff(params[:sha], params[:other_sha])
   end
   
   def blob
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
-    @blob = @git.blob(params[:sha])
+    @git = @repository.git
+    @commit = @git.commit(params[:sha])
+    @blob = @git.tree(@commit.tree.id, ["#{params[:path].join("/")}"]).contents.first
+    render_not_found and return unless @blob
   end
   
   def raw
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
-    @blob = @git.blob(params[:sha])
-    render :text => @blob.contents, :content_type => "text/plain"
+    @git = @repository.git
+    @commit = @git.commit(params[:sha])
+    @blob = @git.tree(@commit.tree.id, ["#{params[:path].join("/")}"]).contents.first
+    render_not_found and return unless @blob
+    render :text => @blob.data, :content_type => "text/plain"
   end
   
   def log
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @git = @repository.git
     skip = params[:page].blank? ? 0 : (params[:page].to_i-1) * LOGS_PER_PAGE
-    @commits = @git.log(LOGS_PER_PAGE, skip)
-    @tags_per_sha = @git.tags_by_sha
+    @commits = @git.commits(@repository.head_candidate.name, LOGS_PER_PAGE, skip)
     # TODO: Patch rails to keep track of what it responds to so we can DRY this up
     @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
     respond_to do |format|

--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -13,7 +13,7 @@ class CommentsController < ApplicationController
   end
   
   def commit
-    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @git = @repository.git
     @commit = @git.commit(params[:sha])
     @comments = @repository.comments.find_all_by_sha1(params[:sha], :include => :user)
   end

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -13,7 +13,7 @@ class RepositoriesController < ApplicationController
     @repository = @project.repositories.find_by_name!(params[:id])
     @comment_count = @repository.comments.count
     if @repository.has_commits?
-      @commits = Gitorious::Gitto.new(@repository.full_repository_path).log(10)
+      @commits = @repository.git.commits(@repository.head_candidate.name, 10)
     else
       @commits = []
     end

--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -36,17 +36,22 @@ module BrowseHelper
     current_path << path
   end
   
-  # def breadcrumb_path
-  #   out = %Q{<ul class="path_breadcrumbs">\n}
-  #   visited_path = []
-  #   out <<  %Q{  <li>/ #{link_to("root", tree_path(params[:sha], []))}</li>\n}
-  #   current_path.each_with_index do |path, index|
-  #     visited_path << path
-  #     out << %Q{  <li>/ #{link_to(path, tree_path(params[:sha], path))}</li>\n}
-  #   end
-  #   out << "</ul>"
-  #   out
-  # end
+  def breadcrumb_path(root_name = "root", commit_id = params[:sha])
+    return if current_path.blank?
+    out = %Q{<ul class="path_breadcrumbs">\n}
+    visited_path = []
+    out <<  %Q{  <li>#{link_to(root_name, tree_path(commit_id, []))}</li>\n}
+    current_path.each_with_index do |path, index|
+      visited_path << path
+      if visited_path == current_path
+        out << %Q{  <li>/ #{path}</li>\n}
+      else
+        out << %Q{  <li>/ #{link_to(path, tree_path(commit_id, visited_path))}</li>\n}
+      end
+    end
+    out << "</ul>"
+    out
+  end
     
   def render_tag_box_if_match(sha, tags_per_sha)
     tags = tags_per_sha[sha]
@@ -61,26 +66,26 @@ module BrowseHelper
   end  
   
   # Takes a unified diff as input and renders it as html
-  def render_diff(udiff, src_sha, dst_sha, display_mode = "inline")
+  def render_diff(udiff, display_mode = "inline")
     return if udiff.blank?
 
     case display_mode
     when "sidebyside"
-      render_sidebyside_diff(udiff, src_sha, dst_sha)
+      render_sidebyside_diff(udiff)
     else
-      render_inline_diff(udiff, src_sha, dst_sha)
+      render_inline_diff(udiff)
     end
   end
   
   #diff = Diff::Display::Unified.new(load_diff("simple"))
   #diff.render(Diff::Renderer::Base.new)
-  def render_inline_diff(udiff, src_sha, dst_sha)
+  def render_inline_diff(udiff)
     differ = Diff::Display::Unified.new(udiff)
     out = %Q{<table class="codediff inline">\n}
     out << "<thead>\n"
     out << "<tr>"
-    out << %Q{<td class="line-numbers">#{src_sha}</td>}
-    out << %Q{<td class="line-numbers">#{dst_sha}</td>}
+    out << %Q{<td class="line-numbers"></td>}
+    out << %Q{<td class="line-numbers"></td>}
     out << "<td>&nbsp</td></tr>\n"
     out << "</thead>\n"
     out << differ.render(Gitorious::Diff::InlineTableCallback.new)
@@ -93,13 +98,13 @@ module BrowseHelper
     out
   end
   
-  def render_sidebyside_diff(udiff, src_sha, dst_sha)
+  def render_sidebyside_diff(udiff)
     differ = Diff::Display::Unified.new(udiff)
     out = %Q{<table class="codediff sidebyside">\n}
     out << %Q{<colgroup class="left"><col class="lines"/><col class="code"/></colgroup>}
     out << %Q{<colgroup class="right"><col class="lines"/><col class="code"/></colgroup>}
-    out << %Q{<thead><th class="line-numbers">#{src_sha}</th><th></th>}
-    out << %Q{<th class="line-numbers">#{dst_sha}</th><th></th></thead>}
+    out << %Q{<thead><th class="line-numbers"></th><th></th>}
+    out << %Q{<th class="line-numbers"></th><th></th></thead>}
     out << differ.render(Gitorious::Diff::SidebysideTableCallback.new)
     out << %Q{<tr class="toggle_diff"><td colspan="4">}
     out << %Q{<small>#{link_to_function "toggle raw diff", "$('diff#{udiff.object_id}').toggle()"}</small></td></tr>}

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -15,6 +15,8 @@ class Repository < ActiveRecord::Base
   after_create :add_user_as_committer, :create_new_repos_task
   after_destroy :create_delete_repos_task
   
+  BASE_REPOSITORY_URL = "gitorious.org"
+  
   def self.new_by_cloning(other, username=nil)
     suggested_name = username ? "#{username}s-#{other.name}-clone" : nil
     new(:parent => other, :project => other.project, :name => suggested_name)
@@ -24,7 +26,18 @@ class Repository < ActiveRecord::Base
     find_by_name(name) || raise(ActiveRecord::RecordNotFound)
   end
   
-  BASE_REPOSITORY_URL = "gitorious.org"
+  def self.create_git_repository(path)
+    git_backend.create(full_path_from_partial_path(path))
+  end
+  
+  def self.clone_git_repository(target_path, source_path)
+    git_backend.clone(full_path_from_partial_path(target_path), 
+      full_path_from_partial_path(source_path))
+  end
+  
+  def self.delete_git_repository(path)
+    git_backend.delete!(full_path_from_partial_path(path))
+  end
   
   def gitdir
     File.join(project.slug, "#{name}.git")
@@ -42,21 +55,13 @@ class Repository < ActiveRecord::Base
     self.class.full_path_from_partial_path(gitdir)
   end
   
-  def self.create_git_repository(path)
-    git_backend.create(full_path_from_partial_path(path))
-  end
-  
-  def self.clone_git_repository(target_path, source_path)
-    git_backend.clone(full_path_from_partial_path(target_path), 
-      full_path_from_partial_path(source_path))
-  end
-  
-  def self.delete_git_repository(path)
-    git_backend.delete!(full_path_from_partial_path(path))
+  def git
+    Grit::Repo.new(full_repository_path)
   end
   
   def has_commits?
-    git_backend.repository_has_commits?(full_repository_path)
+    return false if new_record? || !ready?
+    !git.heads.empty?
   end
   
   def self.git_backend
@@ -81,9 +86,14 @@ class Repository < ActiveRecord::Base
     end
   end
   
+  def head_candidate
+    return nil unless has_commits?
+    @head_candidate ||= git.heads.find{|h| h.name == "master"} || git.heads.first
+  end
+  
   def last_commit
     if has_commits?
-      @last_commit ||= Git.bare(full_repository_path).log(1).first
+      @last_commit ||= git.commits(head_candidate.name, 1).first
     end
     @last_commit
   end

--- a/app/views/browse/_commit_infobox.html.erb
+++ b/app/views/browse/_commit_infobox.html.erb
@@ -1,10 +1,10 @@
 <ul class="infobox">
-  <li><strong>Date:</strong> <%=h @commit.date -%></li>
+  <li><strong>Date:</strong> <%=h @commit.committed_date -%></li>
   <li><strong>Committer:</strong> <%=h @commit.committer.name -%> (<%=h @commit.committer.email -%>)</li>
   <% unless @commit.author.email == @commit.committer.email -%>
   <li><strong>Author:</strong> <%=h @commit.author.name -%> (<%=h @commit.author.email -%>)</li>
   <% end -%>
-  <li><strong>Commit SHA1:</strong> <%=h @commit.sha -%></li>
-  <li><strong>Tree SHA1:</strong> <%= link_to h(@commit.gtree.sha), 
-    project_repository_tree_path(@project, @repository, @commit.gtree.sha) -%></li>
+  <li><strong>Commit SHA1:</strong> <%=h @commit.id -%></li>
+  <li><strong>Tree SHA1:</strong> <%= link_to h(@commit.tree.id), 
+    project_repository_tree_path(@project, @repository, @commit.id) -%></li>
 </ul>
\ No newline at end of file

--- a/app/views/browse/_log.html.erb
+++ b/app/views/browse/_log.html.erb
@@ -1,9 +1,9 @@
 <ul>
 <% @commits.each do |commit| -%>
 <li class="commit_item">
-  <a href=""><%= link_to h(commit.sha)[0,6], 
-    project_repository_commit_path(@project, @repository, commit.sha) -%></a> 
-  by <strong><%=h commit.committer.name -%></strong> <%=h time_ago_in_words(commit.committer.date) -%> ago
+  <a href=""><%= link_to h(commit.id_abbrev), 
+    project_repository_commit_path(@project, @repository, commit.id) -%></a> 
+  by <strong><%=h commit.committer.name -%></strong> <%=h time_ago_in_words(commit.committed_date) -%> ago
   <div class="commit_message"><%= simple_format(h(commit.message)) -%></div>
 </li>
 <% end -%>

--- /dev/null
+++ b/app/views/browse/_tags_and_branches.html.erb
@@ -0,0 +1,13 @@
+<h5>Branches:</h5>
+<ul class="links">
+  <% @git.branches.each do |branch| -%>
+  <li><%= link_to h(branch.name), commit_path(branch.commit.id) -%></li>
+  <% end -%>
+</ul>
+
+<h5>Tags:</h5>
+<ul class="links">
+<% @git.tags.each do |tag| -%>
+  <li><%= link_to h(tag.name), commit_path(tag.sha) -%></li>
+<% end -%>
+</ul>
\ No newline at end of file

--- a/app/views/browse/blob.html.erb
+++ b/app/views/browse/blob.html.erb
@@ -12,9 +12,11 @@
 
 <h1>
   Blob of <code><%= current_path.join("/") -%></code> 
-  <small>(<%= link_to "raw blob data", raw_blob_path(@blob.sha, current_path) -%>)</small>
+  <small>(<%= link_to "raw blob data", raw_blob_path(@commit.id, current_path) -%>)</small>
 </h1>
 
+<%= breadcrumb_path(@repository.name, @commit.id) -%>
+
 <% cache do -%>
-  <%= render_highlighted(@blob.contents, current_path.last || "") -%>
+  <%= render_highlighted(@blob.data, current_path.last || "") -%>
 <% end -%>

--- a/app/views/browse/commit.html.erb
+++ b/app/views/browse/commit.html.erb
@@ -1,6 +1,6 @@
 <% @page_title = "Commit in #{@repository.name} in #{@project.title}" -%>
 
-<h1>Commit <%=h @commit.sha -%></h1>
+<h1>Commit <%=h @commit.id -%></h1>
 
 <div class="commit_message"><%= simple_format(h(@commit.message)) -%></div>
 <%= render :partial => "commit_infobox" -%>
@@ -8,7 +8,7 @@
 <ul class="tab_menu">
   <li class="selected">Commit diff</li>
   <li><%= link_to "Comments (#{@comment_count})", 
-            project_repository_commit_comment_path(@project, @repository, @commit.sha) -%></li>
+            project_repository_commit_comment_path(@project, @repository, @commit.id) -%></li>
 </ul>
 
 
@@ -16,17 +16,17 @@
 <% if @diff.blank? -%>
   <p>
     This is the initial commit in this repository, 
-    <%= link_to "browse the initial tree state", tree_path(@commit.gtree.sha) -%>.
+    <%= link_to "browse the initial tree state", tree_path(@commit.id) -%>.
   </p>
 <% else -%>
 <% cache({:diffmode => @diffmode}) do -%>
-  <%= render_diff_stats(@diff.stats) -%>
+  <%#= render_diff_stats(@diff.stats) -%>
   <h2>Commit diff</h2>
   <%= render_diffmode_selector -%>
-  <% @diff.each do |file, index| -%>
-    <a name="<%= h(file.path) -%>"></a>
-    <h4><%= h(file.path) -%><%#=link_to h(file.path), blob_path(file.sha, file.path) -%></h4>
-    <%= render_diff(file.patch, file.src, file.dst, @diffmode) -%>
+  <% @diff.each do |file| -%>
+    <a name="<%= h(file.a_path) -%>"></a>
+    <h4><%=h(file.a_path) -%></h4>
+    <%= render_diff(file.diff, @diffmode) -%>
   <% end -%>
 <% end -%>
 <% end -%>

--- a/app/views/browse/index.atom.builder
+++ b/app/views/browse/index.atom.builder
@@ -1,20 +1,20 @@
 atom_feed do |feed|
   feed.title("Gitorious: #{@project.title} - #{@repository.name}")
-  feed.updated((@commits.blank? ? nil : @commits.first.date))
+  feed.updated((@commits.blank? ? nil : @commits.first.committed_date))
 
   @commits.each do |commit|
-    item_url = "http://gitorious.org" +  project_repository_commit_path(@project, @repository, commit.sha)
-    feed.entry(commit.sha, {
+    item_url = "http://gitorious.org" +  project_repository_commit_path(@project, @repository, commit.id)
+    feed.entry(commit.id, {
       :url => item_url, 
-      :updated => commit.date, 
-      :published => commit.date,
-      :id => "#{@repository.name}:#{commit.sha}"
+      :updated => commit.committed_date, 
+      :published => commit.committed_date,
+      :id => "#{@repository.name}:#{commit.id}"
     }) do |entry|
       entry.title(truncate(commit.message, 75))
       entry.content(<<-EOS, :type => 'html')
 <h1>In #{@repository.gitdir}</h1>
 <pre>
-Date:   #{commit.date.strftime("%Y-%m-%d %H:%M")}
+Date:   #{commit.committed_date.strftime("%Y-%m-%d %H:%M")}
 Committer: #{commit.committer.name} (#{commit.committer.email})
 Message:
 #{commit.message}

--- a/app/views/browse/index.html.erb
+++ b/app/views/browse/index.html.erb
@@ -6,25 +6,13 @@
 <ul class="infobox">
   <li><strong>Project:</strong> <%= link_to h(@repository.project.title), @repository.project -%></li>
   <li><strong>Owner:</strong> <%= link_to h(@repository.user.login), @repository.user -%></li>
-  <li><strong>HEAD tree:</strong> <%= link_to h(@commits.first.gtree.sha), 
-    tree_path(@commits.first.gtree.sha) -%></li>
+  <li><strong>HEAD tree:</strong> <%= link_to h(@commits.first.tree.id), 
+    tree_path(@commits.id) -%></li>
 </ul>
 
 <h2>Commits</h2>
 <%= render :partial => "log", :locals => {:commits => @commits} -%>
 
 <% content_for :sidebar do -%>  
-  <h5>Branches:</h5>
-  <ul class="links">
-    <% @git.branches.each do |branch| -%>
-    <li><%= link_to h(branch.name), commit_path(branch.gcommit.sha) -%></li>
-    <% end -%>
-  </ul>
-
-  <h5>Tags:</h5>
-  <ul class="links">
-  <% @git.tags.each do |tag| -%>
-    <li><%= link_to h(tag.name), commit_path(tag.sha) -%></li>
-  <% end -%>
-  </ul>
+  <%= render :partial => "tags_and_branches" -%>
 <% end -%>
\ No newline at end of file

--- a/app/views/browse/log.html.erb
+++ b/app/views/browse/log.html.erb
@@ -9,14 +9,14 @@
   <h5>Branches:</h5>
   <ul class="links">
     <% @git.branches.each do |branch| -%>
-    <li><%= link_to h(branch.name), commit_path(branch.gcommit.sha) -%></li>
+    <li><%= link_to h(branch.name), commit_path(branch.commit.id) -%></li>
     <% end -%>
   </ul>
 
   <h5>Tags:</h5>
   <ul class="links">
   <% @git.tags.each do |tag| -%>
-    <li><%= link_to h(tag.name), commit_path(tag.sha) -%></li>
+    <li><%= link_to h(tag.name), commit_path(tag.id) -%></li>
   <% end -%>
   </ul>
 <% end -%>
\ No newline at end of file

--- a/app/views/browse/tree.html.erb
+++ b/app/views/browse/tree.html.erb
@@ -1,21 +1,24 @@
 <% @page_title = "Tree for #{@repository.name} in #{@project.title}" -%>
 <h1>
-  Browsing tree of <%= h(@repository.name) -%> repository in <%= h(@project.title) -%>
+  Tree of <%= h(@repository.name) -%> repository in <%= h(@project.title) -%>
 </h1>
 
+<%= breadcrumb_path(@repository.name, @commit.id) -%>
+
 <table class="listing tree">
-  <% @tree.children.sort_by{|f,n| f.downcase }.each do |file, node| -%>
+  <% @tree.contents.sort_by{|c| c.name.downcase}.each do |node| -%>
   <tr class="<%= cycle("odd", "even") -%>">
     <!-- <td><%#= h(node.mode) -%></td> -->
-    <% if node.type == "tree" -%>
-      <td class="node tree"><%= link_to h(file + "/"), tree_path(node.sha, build_tree_path(file)) -%></td>
-      <td class="link"><%= link_to node.type, tree_path(node.sha, build_tree_path(file)) -%></td>
-    <!-- TODO: archive -->
+    <% if node.is_a? Grit::Tree -%>
+      <td class="node tree"><%= link_to h(node.basename) + "/", tree_path(@commit.id, node.name) -%></td>
     <% else -%>
-      <td class="node file"><%= link_to h(file), blob_path(node.sha, build_tree_path(file)) -%></td>
-      <td class="link"><%= link_to node.type, blob_path(node.sha, build_tree_path(file)) -%></td>
+      <td class="node file"><%= link_to h(node.basename), blob_path(@commit.id, node.name) -%></td>
     <% end -%>
-    <td class="sha1"><%= h(node.sha[0..16]) -%></td>
+    <td></td>
   </tr>
   <% end -%>
 </table>
+
+<% content_for :sidebar do -%>  
+  <%= render :partial => "tags_and_branches" -%>
+<% end -%>
\ No newline at end of file

--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -5,7 +5,7 @@
     <%= link_to(h(comment.user.login), comment.user) -%> | 
     <%= comment.created_at.to_s(:short) -%> 
     <% unless comment.sha1.blank? -%>
-    | <%= link_to "on commit #{comment.sha1[0..8]}", project_repository_commit_path(@project, @repository, comment.sha1) -%> 
+    | <%= link_to "on commit #{comment.sha1[0..7]}", project_repository_commit_path(@project, @repository, comment.sha1) -%> 
     <% end -%>
     | <a href="#<%= dom_id(comment) -%>"><abbr title="permalink for this comment">#</abbr></a> 
   </p>

--- a/app/views/comments/commit.html.erb
+++ b/app/views/comments/commit.html.erb
@@ -1,5 +1,5 @@
 <% @page_title = "Comments in #{@repository.name}" -%>
-<h1>Comments on commit <%= h(@commit.sha) -%> in <%= h(@repository.name) -%></h1>
+<h1>Comments on commit <%= h(@commit.id[0,7]) -%> in <%= h(@repository.name) -%></h1>
 
 <p><pre><%=h @commit.message -%></pre></p>
 
@@ -7,10 +7,10 @@
 
 <ul class="tab_menu">
   <li><%= link_to "Commit diff", 
-      project_repository_commit_path(@project, @repository, @commit.sha) -%></li>
+      project_repository_commit_path(@project, @repository, @commit.id) -%></li>
   <li class="selected">Comments (<%= @comments.size -%>)</li>
 </ul>
 
 <%= render :partial => @comments -%>
 
-<%= render :partial => "form", :locals => {:sha1 => @commit.sha} -%>
+<%= render :partial => "form", :locals => {:sha1 => @commit.id} -%>