Merge branch 'refactor/gitlab_git'

Dmitriy Zaporozhets
2 parents 273741fb 8a6bf09a
Showing 72 changed files with 918 additions and 836 deletions Show diff stats
app/contexts/commit_load_context.rb
app/controllers/blame_controller.rb
app/controllers/commits_controller.rb
app/controllers/compare_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/refs_controller.rb
app/decorators/commit_decorator.rb
app/decorators/tree_decorator.rb
app/helpers/application_helper.rb
app/helpers/commits_helper.rb
app/helpers/tree_helper.rb
app/mailers/emails/notes.rb
app/models/commit.rb
app/models/gollum_wiki.rb
app/models/merge_request.rb
app/models/network/commit.rb
app/models/project.rb
app/models/repository.rb
app/models/tree.rb
app/models/wiki_page.rb
@@ -12,7 +12,6 @@ class CommitLoadContext &lt; BaseContext
     commit = project.repository.commit(params[:id])
     if commit
-      commit = CommitDecorator.decorate(commit)
       line_notes = project.notes.for_commit_id(commit.id).inline
       result[:commit] = commit
@@ -8,7 +8,6 @@ class BlameController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
-    @repo = @project.repo
-    @blame = Grit::Blob.blame(@repo, @commit.id, @path)
+    @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
   end
 end
@@ -13,7 +13,6 @@ class CommitsController &lt; ProjectResourceController
     @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
     @commits = @repo.commits(@ref, @path, @limit, @offset)
-    @commits = CommitDecorator.decorate_collection(@commits)
     respond_to do |format|
       format.html # index.html.erb
@@ -8,15 +8,13 @@ class CompareController &lt; ProjectResourceController
   end
   def show
-    result = Commit.compare(project, params[:from], params[:to])
+    compare = Gitlab::Git::Compare.new(project.repository, params[:from], params[:to])
-    @commits       = result[:commits]
-    @commit        = result[:commit]
-    @diffs         = result[:diffs]
-    @refs_are_same = result[:same]
+    @commits       = compare.commits
+    @commit        = compare.commit
+    @diffs         = compare.diffs
+    @refs_are_same = compare.same
     @line_notes    = []
-
-    @commits = CommitDecorator.decorate_collection(@commits)
   end
   def create
@@ -94,12 +94,10 @@ class MergeRequestsController &lt; ProjectResourceController
   def branch_from
     @commit = @repository.commit(params[:ref])
-    @commit = CommitDecorator.decorate(@commit)
   end
   def branch_to
     @commit = @repository.commit(params[:ref])
-    @commit = CommitDecorator.decorate(@commit)
   end
   def ci_status
@@ -143,7 +141,6 @@ class MergeRequestsController &lt; ProjectResourceController
     # Get commits from repository
     # or from cache if already merged
     @commits = @merge_request.commits
-    @commits = CommitDecorator.decorate_collection(@commits)
     @allowed_to_merge = allowed_to_merge?
     @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
@@ -34,7 +34,6 @@ class RefsController &lt; ProjectResourceController
     @logs = contents.map do |content|
       file = params[:path] ? File.join(params[:path], content.name) : content.name
       last_commit = @repo.commits(@commit.id, file, 1).last
-      last_commit = CommitDecorator.decorate(last_commit)
       {
         file_name: content.name,
         commit: last_commit
@@ -49,9 +48,7 @@ class RefsController &lt; ProjectResourceController
     @repo = project.repository
     @commit = @repo.commit(@ref)
-    @commit = CommitDecorator.decorate(@commit)
     @tree = Tree.new(@commit.tree, @ref, params[:path])
-    @tree = TreeDecorator.new(@tree)
     @hex_path = Digest::SHA1.hexdigest(params[:path] || "")
     if params[:path]
@@ -1,93 +0,0 @@
-class CommitDecorator < ApplicationDecorator
-  decorates :commit
-
-  # Returns a string describing the commit for use in a link title
-  #
-  # Example
-  #
-  #   "Commit: Alex Denisov - Project git clone panel"
-  def link_title
-    "Commit: #{author_name} - #{title}"
-  end
-
-  # Returns the commits title.
-  #
-  # Usually, the commit title is the first line of the commit message.
-  # In case this first line is longer than 80 characters, it is cut off
-  # after 70 characters and ellipses (`&hellp;`) are appended.
-  def title
-    title = safe_message
-
-    return no_commit_message if title.blank?
-
-    title_end = title.index(/\n/)
-    if (!title_end && title.length > 80) || (title_end && title_end > 80)
-      title[0..69] << "&hellip;".html_safe
-    else
-      title.split(/\n/, 2).first
-    end
-  end
-
-  # Returns the commits description
-  #
-  # cut off, ellipses (`&hellp;`) are prepended to the commit message.
-  def description
-    description = safe_message
-
-    title_end = description.index(/\n/)
-    if (!title_end && description.length > 80) || (title_end && title_end > 80)
-      "&hellip;".html_safe << description[70..-1]
-    else
-      description.split(/\n/, 2)[1].try(:chomp)
-    end
-  end
-
-  # Returns a link to the commit author. If the author has a matching user and
-  # is a member of the current @project it will link to the team member page.
-  # Otherwise it will link to the author email as specified in the commit.
-  #
-  # options:
-  #  avatar: true will prepend the avatar image
-  #  size:   size of the avatar image in px
-  def author_link(options = {})
-    person_link(options.merge source: :author)
-  end
-
-  # Just like #author_link but for the committer.
-  def committer_link(options = {})
-    person_link(options.merge source: :committer)
-  end
-
-  protected
-
-  def no_commit_message
-    "--no commit message"
-  end
-
-  # Private: Returns a link to a person. If the person has a matching user and
-  # is a member of the current @project it will link to the team member page.
-  # Otherwise it will link to the person email as specified in the commit.
-  #
-  # options:
-  #  source: one of :author or :committer
-  #  avatar: true will prepend the avatar image
-  #  size:   size of the avatar image in px
-  def person_link(options = {})
-    source_name = send "#{options[:source]}_name".to_sym
-    source_email = send "#{options[:source]}_email".to_sym
-    text = if options[:avatar]
-            avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: ""
-            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
-          else
-            source_name
-          end
-
-    user = User.where('name like ? or email like ?', source_name, source_email).first
-
-    if user.nil?
-      h.mail_to(source_email, text.html_safe, class: "commit-#{options[:source]}-link")
-    else
-      h.link_to(text.html_safe, h.user_path(user), class: "commit-#{options[:source]}-link")
-    end
-  end
-end
@@ -1,33 +0,0 @@
-class TreeDecorator < ApplicationDecorator
-  decorates :tree
-
-  def breadcrumbs(max_links = 2)
-    if path
-      part_path = ""
-      parts = path.split("\/")
-
-      yield('..', nil) if parts.count > max_links
-
-      parts.each do |part|
-        part_path = File.join(part_path, part) unless part_path.empty?
-        part_path = part if part_path.empty?
-
-        next unless parts.last(2).include?(part) if parts.count > max_links
-        yield(part, h.tree_join(ref, part_path))
-      end
-    end
-  end
-
-  def up_dir?
-    path.present?
-  end
-
-  def up_dir_path
-    file = File.join(path, "..")
-    h.tree_join(ref, file)
-  end
-
-  def readme
-    @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
-  end
-end
@@ -96,7 +96,7 @@ module ApplicationHelper
     ]
     project_nav = []
-    if @project && @project.repository && @project.repository.root_ref
+    if @project && @project.repository.exists? && @project.repository.root_ref
       project_nav = [
         { label: "#{simple_sanitize(@project.name_with_namespace)} - Issues",   url: project_issues_path(@project) },
         { label: "#{simple_sanitize(@project.name_with_namespace)} - Commits",  url: project_commits_path(@project, @ref || @project.repository.root_ref) },
 module CommitsHelper
+  # Returns a link to the commit author. If the author has a matching user and
+  # is a member of the current @project it will link to the team member page.
+  # Otherwise it will link to the author email as specified in the commit.
+  #
+  # options:
+  #  avatar: true will prepend the avatar image
+  #  size:   size of the avatar image in px
+  def commit_author_link(commit, options = {})
+    commit_person_link(commit, options.merge(source: :author))
+  end
+
+  # Just like #author_link but for the committer.
+  def commit_committer_link(commit, options = {})
+    commit_person_link(commit, options.merge(source: :committer))
+  end
+
   def identification_type(line)
     if line[0] == "+"
       "new"
@@ -93,9 +109,7 @@ module CommitsHelper
   end
   def commit_to_html commit
-    if commit.model
-      escape_javascript(render 'commits/commit', commit: commit)
-    end
+    escape_javascript(render 'commits/commit', commit: commit)
   end
   def diff_line_content(line)
@@ -105,4 +119,58 @@ module CommitsHelper
       line
     end
   end
+
+  # Breadcrumb links for a Project and, if applicable, a tree path
+  def commits_breadcrumbs
+    return unless @project && @ref
+
+    # Add the root project link and the arrow icon
+    crumbs = content_tag(:li) do
+      content_tag(:span, nil, class: 'arrow') +
+      link_to(@project.name, project_commits_path(@project, @ref))
+    end
+
+    if @path
+      parts = @path.split('/')
+
+      parts.each_with_index do |part, i|
+        crumbs += content_tag(:span, '/', class: 'divider')
+        crumbs += content_tag(:li) do
+          # The text is just the individual part, but the link needs all the parts before it
+          link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
+        end
+      end
+    end
+
+    crumbs.html_safe
+  end
+
+  protected
+
+  # Private: Returns a link to a person. If the person has a matching user and
+  # is a member of the current @project it will link to the team member page.
+  # Otherwise it will link to the person email as specified in the commit.
+  #
+  # options:
+  #  source: one of :author or :committer
+  #  avatar: true will prepend the avatar image
+  #  size:   size of the avatar image in px
+  def commit_person_link(commit, options = {})
+    source_name = commit.send "#{options[:source]}_name".to_sym
+    source_email = commit.send "#{options[:source]}_email".to_sym
+    text = if options[:avatar]
+            avatar = image_tag(gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
+            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
+          else
+            source_name
+          end
+
+    user = User.where('name like ? or email like ?', source_name, source_email).first
+
+    if user.nil?
+      mail_to(source_email, text.html_safe, class: "commit-#{options[:source]}-link")
+    else
+      link_to(text.html_safe, user_path(user), class: "commit-#{options[:source]}-link")
+    end
+  end
 end
@@ -70,28 +70,26 @@ module TreeHelper
     end
   end
-  # Breadcrumb links for a Project and, if applicable, a tree path
-  def breadcrumbs
-    return unless @project && @ref
-
-    # Add the root project link and the arrow icon
-    crumbs = content_tag(:li) do
-      content_tag(:span, nil, class: 'arrow') +
-      link_to(@project.name, project_commits_path(@project, @ref))
-    end
+  def tree_breadcrumbs(tree, max_links = 2)
+    if tree.path
+      part_path = ""
+      parts = tree.path.split("\/")
+
+      yield('..', nil) if parts.count > max_links
-    if @path
-      parts = @path.split('/')
+      parts.each do |part|
+        part_path = File.join(part_path, part) unless part_path.empty?
+        part_path = part if part_path.empty?
-      parts.each_with_index do |part, i|
-        crumbs += content_tag(:span, '/', class: 'divider')
-        crumbs += content_tag(:li) do
-          # The text is just the individual part, but the link needs all the parts before it
-          link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
-        end
+        next unless parts.last(2).include?(part) if parts.count > max_links
+        yield(part, tree_join(tree.ref, part_path))
       end
     end
+  end
-    crumbs.html_safe
+  def up_dir_path tree
+    file = File.join(tree.path, "..")
+    tree_join(tree.ref, file)
   end
+
 end
@@ -3,7 +3,6 @@ module Emails
     def note_commit_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @commit = @note.noteable
-      @commit = CommitDecorator.decorate(@commit)
       @project = @note.project
       mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title))
     end
@@ -8,174 +8,70 @@ class Commit
   #
   DIFF_SAFE_SIZE = 100
-  attr_accessor :commit, :head, :refs
-
-  delegate  :message, :authored_date, :committed_date, :parents, :sha,
-            :date, :committer, :author, :diffs, :tree, :id, :stats,
-            :to_patch, to: :commit
-
-  class << self
-    def find_or_first(repo, commit_id = nil, root_ref)
-      commit = if commit_id
-                 repo.commit(commit_id)
-               else
-                 repo.commits(root_ref).first
-               end
-
-      Commit.new(commit) if commit
-    end
-
-    def fresh_commits(repo, n = 10)
-      commits = repo.heads.map do |h|
-        repo.commits(h.name, n).map { |c| Commit.new(c, h) }
-      end.flatten.uniq { |c| c.id }
-
-      commits.sort! do |x, y|
-        y.committed_date <=> x.committed_date
-      end
-
-      commits[0...n]
-    end
-
-    def commits_with_refs(repo, n = 20)
-      commits = repo.branches.map { |ref| Commit.new(ref.commit, ref) }
-
-      commits.sort! do |x, y|
-        y.committed_date <=> x.committed_date
-      end
-
-      commits[0..n]
-    end
-
-    def commits_since(repo, date)
-      commits = repo.heads.map do |h|
-        repo.log(h.name, nil, since: date).each { |c| Commit.new(c, h) }
-      end.flatten.uniq { |c| c.id }
-
-      commits.sort! do |x, y|
-        y.committed_date <=> x.committed_date
-      end
-
-      commits
-    end
-
-    def commits(repo, ref, path = nil, limit = nil, offset = nil)
-      if path
-        repo.log(ref, path, max_count: limit, skip: offset)
-      elsif limit && offset
-        repo.commits(ref, limit, offset)
-      else
-        repo.commits(ref)
-      end.map{ |c| Commit.new(c) }
-    end
-
-    def commits_between(repo, from, to)
-      repo.commits_between(from, to).map { |c| Commit.new(c) }
-    end
-
-    def compare(project, from, to)
-      result = {
-        commits: [],
-        diffs: [],
-        commit: nil,
-        same: false
-      }
-
-      return result unless from && to
-
-      first = project.repository.commit(to.try(:strip))
-      last = project.repository.commit(from.try(:strip))
-
-      if first && last
-        result[:same] = (first.id == last.id)
-        result[:commits] = project.repo.commits_between(last.id, first.id).map {|c| Commit.new(c)}
-
-        # Dont load diff for 100+ commits
-        result[:diffs] = if result[:commits].size > 100
-                           []
-                         else
-                           project.repo.diff(last.id, first.id) rescue []
-                         end
-
-        result[:commit] = Commit.new(first)
-      end
-
-      result
-    end
-  end
-
-  def initialize(raw_commit, head = nil)
-    raise "Nil as raw commit passed" unless raw_commit
-
-    @commit = raw_commit
-    @head = head
-  end
-
-  def short_id(length = 10)
-    id.to_s[0..length]
+  def self.decorate(commits)
+    commits.map { |c| self.new(c) }
   end
-  def safe_message
-    @safe_message ||= message
-  end
-
-  def created_at
-    committed_date
-  end
+  attr_accessor :raw
-  def author_email
-    author.email
-  end
+  def initialize(raw_commit)
+    raise "Nil as raw commit passed" unless raw_commit
-  def author_name
-    author.name
+    @raw = raw_commit
   end
-  # Was this commit committed by a different person than the original author?
-  def different_committer?
-    author_name != committer_name || author_email != committer_email
+  def id
+    @raw.id
   end
-  def committer_name
-    committer.name
+  # Returns a string describing the commit for use in a link title
+  #
+  # Example
+  #
+  #   "Commit: Alex Denisov - Project git clone panel"
+  def link_title
+    "Commit: #{author_name} - #{title}"
   end
-  def committer_email
-    committer.email
+  # Returns the commits title.
+  #
+  # Usually, the commit title is the first line of the commit message.
+  # In case this first line is longer than 80 characters, it is cut off
+  # after 70 characters and ellipses (`&hellp;`) are appended.
+  def title
+    title = safe_message
+
+    return no_commit_message if title.blank?
+
+    title_end = title.index(/\n/)
+    if (!title_end && title.length > 80) || (title_end && title_end > 80)
+      title[0..69] << "&hellip;".html_safe
+    else
+      title.split(/\n/, 2).first
+    end
   end
-  def prev_commit
-    @prev_commit ||= if parents.present?
-                       Commit.new(parents.first)
-                     else
-                       nil
-                     end
+  # Returns the commits description
+  #
+  # cut off, ellipses (`&hellp;`) are prepended to the commit message.
+  def description
+    description = safe_message
+
+    title_end = description.index(/\n/)
+    if (!title_end && description.length > 80) || (title_end && title_end > 80)
+      "&hellip;".html_safe << description[70..-1]
+    else
+      description.split(/\n/, 2)[1].try(:chomp)
+    end
   end
-  def prev_commit_id
-    prev_commit.try :id
+  def method_missing(m, *args, &block)
+    @raw.send(m, *args, &block)
   end
-  # Shows the diff between the commit's parent and the commit.
-  #
-  # Cuts out the header and stats from #to_patch and returns only the diff.
-  def to_diff
-    # see Grit::Commit#show
-    patch = to_patch
-
-    # discard lines before the diff
-    lines = patch.split("\n")
-    while !lines.first.start_with?("diff --git") do
-      lines.shift
-    end
-    lines.pop if lines.last =~ /^[\d.]+$/ # Git version
-    lines.pop if lines.last == "-- "      # end of diff
-    lines.join("\n")
-  end
+  def respond_to?(method)
+    return true if @raw.respond_to?(method)
-  def has_zero_stats?
-    stats.total.zero?
-  rescue
-    true
+    super
   end
 end
@@ -50,7 +50,7 @@ class GollumWiki
   # Returns the last 30 Commit objects across the entire
   # repository.
   def recent_history
-    Commit.fresh_commits(wiki.repo, 30)
+    Gitlab::Git::Commit.fresh_commits(wiki.repo, 30)
   end
   # Finds a page within the repository based on a tile
@@ -90,13 +90,17 @@ class GollumWiki
   private
   def create_repo!
-    if gitlab_shell.add_repository(path_with_namespace)
+    if init_repo(path_with_namespace)
       Gollum::Wiki.new(path_to_repo)
     else
       raise CouldNotCreateWikiError
     end
   end
+  def init_repo(path_with_namespace)
+    gitlab_shell.add_repository(path_with_namespace)
+  end
+
   def commit_details(action, message = nil, title = nil)
     commit_message = message || default_message(action, title)
@@ -114,5 +118,4 @@ class GollumWiki
   def path_to_repo
     @path_to_repo ||= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
   end
-
 end
@@ -152,7 +152,17 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def commits
-    st_commits || []
+    if st_commits.present?
+      # check if merge request commits are valid
+      if st_commits.first.respond_to?(:short_id)
+        st_commits
+      else
+        # if commits are invalid - simply reload it from repo
+        reloaded_commits
+      end
+    else
+      []
+    end
   end
   def probably_merged?
@@ -169,9 +179,8 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def unmerged_commits
-    self.project.repo.
+    self.project.repository.
       commits_between(self.target_branch, self.source_branch).
-      map {|c| Commit.new(c)}.
       sort_by(&:created_at).
       reverse
   end
@@ -8,7 +8,7 @@ module Network
     attr_accessor :time, :spaces, :parent_spaces
     def initialize(raw_commit, refs)
-      @commit = ::Commit.new(raw_commit)
+      @commit = Gitlab::Git::Commit.new(raw_commit)
       @time = -1
       @spaces = []
       @parent_spaces = []
@@ -141,13 +141,7 @@ class Project &lt; ActiveRecord::Base
   end
   def repository
-    if path
-      @repository ||= Repository.new(path_with_namespace, default_branch)
-    else
-      nil
-    end
-  rescue Grit::NoSuchPathError
-    nil
+    @repository ||= Repository.new(path_with_namespace, default_branch)
   end
   def saved?
@@ -332,14 +326,14 @@ class Project &lt; ActiveRecord::Base
   end
   def valid_repo?
-    repo
+    repository.exists?
   rescue
     errors.add(:path, "Invalid repository path")
     false
   end
   def empty_repo?
-    !repository || repository.empty?
+    !repository.exists? || repository.empty?
   end
   def ensure_satellite_exists
@@ -363,7 +357,7 @@ class Project &lt; ActiveRecord::Base
   end
   def repo_exists?
-    @repo_exists ||= (repository && repository.branches.present?)
+    @repo_exists ||= repository.exists?
   rescue
     @repo_exists = false
   end
 class Repository
-  include Gitlab::Popen
+  attr_accessor :raw_repository
-  # Repository directory name with namespace direcotry
-  # Examples:
-  #   gitlab/gitolite
-  #   diaspora
-  #
-  attr_accessor :path_with_namespace
-
-  # Grit repo object
-  attr_accessor :repo
-
-  # Default branch in the repository
-  attr_accessor :root_ref
-
-  def initialize(path_with_namespace, root_ref = 'master')
-    @root_ref = root_ref || "master"
-    @path_with_namespace = path_with_namespace
-
-    # Init grit repo object
-    repo
-  end
-
-  def raw
-    repo
-  end
-
-  def path_to_repo
-    @path_to_repo ||= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
-  end
-
-  def repo
-    @repo ||= Grit::Repo.new(path_to_repo)
-  end
-
-  def commit(commit_id = nil)
-    Commit.find_or_first(repo, commit_id, root_ref)
+  def initialize(path_with_namespace, default_branch)
+    @raw_repository = Gitlab::Git::Repository.new(path_with_namespace, default_branch)
+  rescue Gitlab::Git::Repository::NoRepository
+    nil
   end
-  def fresh_commits(n = 10)
-    Commit.fresh_commits(repo, n)
+  def exists?
+    raw_repository
   end
-  def commits_with_refs(n = 20)
-    Commit.commits_with_refs(repo, n)
+  def empty?
+    raw_repository.empty?
   end
-  def commits_since(date)
-    Commit.commits_since(repo, date)
+  def commit(id = nil)
+    commit = raw_repository.commit(id)
+    commit = Commit.new(commit) if commit
+    commit
   end
   def commits(ref, path = nil, limit = nil, offset = nil)
-    Commit.commits(repo, ref, path, limit, offset)
-  end
-
-  def last_commit_for(ref, path = nil)
-    commits(ref, path, 1).first
-  end
-
-  def commits_between(from, to)
-    Commit.commits_between(repo, from, to)
+    commits = raw_repository.commits(ref, path, limit, offset)
+    commits = Commit.decorate(commits) if commits.present?
+    commits
   end
-  # Returns an Array of branch names
-  # sorted by name ASC
-  def branch_names
-    branches.map(&:name)
+  def commits_between(target, source)
+    commits = raw_repository.commits_between(target, source)
+    commits = Commit.decorate(commits) if commits.present?
+    commits
   end
-  # Returns an Array of Branches
-  def branches
-    repo.branches.sort_by(&:name)
+  def method_missing(m, *args, &block)
+    raw_repository.send(m, *args, &block)
   end
-  # Returns an Array of tag names
-  def tag_names
-    repo.tags.collect(&:name).sort.reverse
-  end
-
-  # Returns an Array of Tags
-  def tags
-    repo.tags.sort_by(&:name).reverse
-  end
-
-  # Returns an Array of branch and tag names
-  def ref_names
-    [branch_names + tag_names].flatten
-  end
-
-  def heads
-    @heads ||= repo.heads
-  end
-
-  def tree(fcommit, path = nil)
-    fcommit = commit if fcommit == :head
-    tree = fcommit.tree
-    path ? (tree / path) : tree
-  end
-
-  def has_commits?
-    !!commit
-  rescue Grit::NoSuchPathError
-    false
-  end
-
-  def empty?
-    !has_commits?
-  end
-
-  # Discovers the default branch based on the repository's available branches
-  #
-  # - If no branches are present, returns nil
-  # - If one branch is present, returns its name
-  # - If two or more branches are present, returns the one that has a name
-  #   matching root_ref (default_branch or 'master' if default_branch is nil)
-  def discover_default_branch
-    if branch_names.length == 0
-      nil
-    elsif branch_names.length == 1
-      branch_names.first
-    else
-      branch_names.select { |v| v == root_ref }.first
-    end
-  end
-
-  # Archive Project to .tar.gz
-  #
-  # Already packed repo archives stored at
-  # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
-  #
-  def archive_repo(ref)
-    ref = ref || self.root_ref
-    commit = self.commit(ref)
-    return nil unless commit
-
-    # Build file path
-    file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = Rails.root.join("tmp", "repositories")
-    file_path = File.join(storage_path, self.path_with_namespace, file_name)
-
-    # Put files into a directory before archiving
-    prefix = File.basename(self.path_with_namespace) + "/"
-
-    # Create file if not exists
-    unless File.exists?(file_path)
-      FileUtils.mkdir_p File.dirname(file_path)
-      file = self.repo.archive_to_file(ref, prefix,  file_path)
-    end
-
-    file_path
-  end
-
-  # Return repo size in megabytes
-  # Cached in redis
-  def size
-    Rails.cache.fetch(cache_key(:size)) do
-      size = popen('du -s', path_to_repo).first.strip.to_i
-      (size.to_f / 1024).round(2)
-    end
-  end
-
-  def expire_cache
-    Rails.cache.delete(cache_key(:size))
-  end
+  def respond_to?(method)
+    return true if raw_repository.respond_to?(method)
-  def cache_key(type)
-    "#{type}:#{path_with_namespace}"
+    super
   end
 end
@@ -26,4 +26,12 @@ class Tree
   def empty?
     data.blank?
   end
+
+  def up_dir?
+    path.present?
+  end
+
+  def readme
+    @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+  end
 end
@@ -79,14 +79,14 @@ class WikiPage
   def version
     return nil unless persisted?
-    @version ||= Commit.new(@page.version)
+    @version ||= Commit.new(Gitlab::Git::Commit.new(@page.version))
   end
   # Returns an array of Gitlab Commit instances.
   def versions
     return [] unless persisted?
-    @page.versions.map { |v| Commit.new(v) }
+    @page.versions.map { |v| Commit.new(Gitlab::Git::Commit.new(v)) }
   end
   # Returns the Date that this latest version was
@@ -46,18 +46,21 @@
           %span.light ssh:
           %strong
             = link_to @project.ssh_url_to_repo
-        %li
-          %span.light fs:
-          %strong
-            = @repository.path_to_repo
+        - if @project.repository.exists?
+          %li
+            %span.light fs:
+            %strong
+              = @repository.path_to_repo
-        %li
-          %span.light last commit:
-          %strong
-            - if @repository
+          %li
+            %span.light last commit:
+            %strong
               = last_commit(@project)
-            - else
-              never
+        - else
+          %li
+            %span.light repository:
+            %strong.cred
+              does not exist
         %li
           %span.light access:
@@ -6,7 +6,7 @@
       %i.icon-angle-right
       = link_to project_tree_path(@project, @ref) do
         = @project.name
-    - @tree.breadcrumbs(6) do |link|
+    - tree_breadcrumbs(@tree, 6) do |link|
       \/
       %li= link
   .clear
@@ -22,13 +22,13 @@
       %table
         - current_line = 1
         - @blame.each do |commit, lines|
-          - commit = CommitDecorator.decorate(Commit.new(commit))
+          - commit = Commit.new(commit)
           %tr
             %td.blame-commit
               %span.commit
                 = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
                 &nbsp;
-                = commit.author_link avatar: true, size: 16
+                = commit_author_link(commit, avatar: true, size: 16)
                 &nbsp;
                 = link_to_gfm truncate(commit.title, length: 20), project_commit_path(@project, commit.id), class: "row_title"
             %td.lines.blame-numbers
@@ -24,14 +24,14 @@
     .row
       .span5
         .author
-          = @commit.author_link avatar: true, size: 32
+          = commit_author_link(@commit, avatar: true, size: 32)
           authored
           %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
             #{time_ago_in_words(@commit.authored_date)} ago
         - if @commit.different_committer?
           .committer
             &rarr;
-            = @commit.committer_link
+            = commit_committer_link(@commit)
             committed
             %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
               #{time_ago_in_words(@commit.committed_date)} ago
@@ -4,7 +4,7 @@
       %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
   %p
     = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
-    = commit.author_link avatar: true, size: 24
+    = commit_author_link(commit, avatar: true, size: 24)
     &nbsp;
     = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "row_title"
@@ -2,7 +2,7 @@
 - if @path.present?
   %ul.breadcrumb
-    = breadcrumbs
+    = commits_breadcrumbs
 %div{id: dom_id(@project)}
   #commits-list= render "commits"
@@ -16,7 +16,7 @@
   %div.ui-box
     %h5.title
       Commits (#{@commits.count})
-    %ul.well-list= render @commits
+    %ul.well-list= render Commit.decorate(@commits)
   - unless @diffs.empty?
     %h4 Diff
-- commit = CommitDecorator.decorate(commit)
 %li.commit
   %p
     = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
@@ -4,7 +4,7 @@
       .form-horizontal= render "shared/clone_panel"
     .span4.pull-right
       .pull-right
-        - unless @project.empty_repo?
+        - if @project.empty_repo?
           - if can? current_user, :download_code, @project
             = link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do
               %i.icon-download-alt
-- commit = Commit.new(branch.commit)
-- commit = CommitDecorator.decorate(commit)
+- commit = Commit.new(Gitlab::Git::Commit.new(branch.commit))
 %tr
   %td
     = link_to project_commits_path(@project, branch.name) do
 - commit = update
-- commit = CommitDecorator.new(commit)
 %tr
   %td
     = link_to project_commits_path(@project, commit.head.name) do
@@ -7,8 +7,7 @@
         %th Last commit
         %th
     - @tags.each do |tag|
-      - commit = Commit.new(tag.commit)
-      - commit = CommitDecorator.decorate(commit)
+      - commit = Commit.new(Gitlab::Git::Commit.new(tag.commit))
       %tr
         %td
           %strong
@@ -3,7 +3,7 @@
     %i.icon-angle-right
     = link_to project_tree_path(@project, @ref) do
       = @project.path
-  - tree.breadcrumbs(6) do |title, path|
+  - tree_breadcrumbs(tree, 6) do |title, path|
     \/
     %li
       - if path
@@ -27,7 +27,7 @@
         %tr.tree-item
           %td.tree-item-file-name
             = image_tag "file_empty.png", size: '16x16'
-            = link_to "..", project_tree_path(@project, tree.up_dir_path)
+            = link_to "..", project_tree_path(@project, up_dir_path(tree))
           %td
           %td
           %td
-%span.tree_author= commit.author_link avatar: true
+%span.tree_author= commit_author_link(commit, avatar: true)
 = link_to_gfm truncate(commit.title, length: 80), project_commit_path(@project, commit.id), class: "tree-commit-link"
@@ -14,12 +14,13 @@
       %th Format
   %tbody
     - @wiki.versions.each do |version|
-      - commit = CommitDecorator.new(version)
+      - commit = version
       %tr
         %td
           = link_to project_wiki_path(@project, @wiki, version_id: commit.id) do
             = commit.short_id
-        %td= commit.author_link avatar: true, size: 24
+        %td
+          = commit_author_link(commit, avatar: true, size: 24)
         %td
           = commit.title
         %td
@@ -21,5 +21,5 @@
           = wiki_page.created_at.to_s(:short) do
             (#{time_ago_in_words(wiki_page.created_at)}
             ago)
-        - commit = CommitDecorator.decorate(wiki_page.version)
-        %td= commit.author_link avatar: true, size: 24
+        %td
+          = commit_author_link(wiki_page.version, avatar: true, size: 24)
@@ -13,5 +13,4 @@
     = preserve do
       = render_wiki_content(@wiki)
-- commit = CommitDecorator.new(@wiki.version)
-%p.time Last edited by #{commit.author_link(avatar: true, size: 16)} #{time_ago_in_words @wiki.created_at} ago
+%p.time Last edited by #{commit_author_link(@wiki.version, avatar: true, size: 16)} #{time_ago_in_words @wiki.created_at} ago
@@ -15,7 +15,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
   end
   Then 'I see commits atom feed' do
-    commit = CommitDecorator.decorate(@project.repository.commit)
+    commit = @project.repository.commit
     page.response_headers['Content-Type'].should have_content("application/atom+xml")
     page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
     page.body.should have_selector("author email", :text => commit.author_email)
@@ -3,14 +3,14 @@ module SharedProject
   # Create a project without caring about what it's called
   And "I own a project" do
-    @project = create(:project)
+    @project = create(:project_with_code)
     @project.team << [@user, :master]
   end
   # Create a specific project called "Shop"
   And 'I own project "Shop"' do
     @project = Project.find_by_name "Shop"
-    @project ||= create(:project, name: "Shop")
+    @project ||= create(:project_with_code, name: "Shop")
     @project.team << [@user, :master]
   end
@@ -132,7 +132,7 @@ class Userteams &lt; Spinach::FeatureSteps
     team = UserTeam.last
     team.projects.each do |project|
       team.members.each do |member|
-        3.times { project.merge_requests << create(:merge_request, assignee: member) }
+        3.times { create(:merge_request, assignee: member, project: project) }
       end
     end
   end
@@ -157,7 +157,7 @@ class Userteams &lt; Spinach::FeatureSteps
     team = UserTeam.last
     team.projects.each do |project|
       team.members.each do |member|
-        3.times { project.merge_requests << create(:merge_request, assignee: member) }
+        3.times { create(:merge_request, assignee: member, project: project) }
       end
     end
   end
@@ -14,7 +14,7 @@ require &#39;spinach/capybara&#39;
 require 'sidekiq/testing/inline'
-%w(stubbed_repository valid_commit select2_helper).each do |f|
+%w(valid_commit select2_helper test_env).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
@@ -35,13 +35,8 @@ Capybara.default_wait_time = 10
 DatabaseCleaner.strategy = :truncation
 Spinach.hooks.before_scenario do
-  # Use tmp dir for FS manipulations
-  Gitlab.config.gitlab_shell.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path'))
-  Gitlab::Shell.any_instance.stub(:add_repository) do |path|
-    create_temp_repo("#{Rails.root}/tmp/test-git-base-path/#{path}.git")
-  end
-  FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path
-  FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
+  TestEnv.init
+
   DatabaseCleaner.start
 end
@@ -54,9 +49,3 @@ Spinach.hooks.before_run do
   include FactoryGirl::Syntax::Methods
 end
-
-def create_temp_repo(path)
-  FileUtils.mkdir_p path
-  command = "git init --quiet --bare #{path};"
-  system(command)
-end
@@ -372,7 +372,7 @@ module Gitlab
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
         commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
-        present CommitDecorator.decorate(commits), with: Entities::RepoCommit
+        present commits, with: Entities::RepoCommit
       end
       # Get a project snippets
@@ -85,8 +85,8 @@ module ExtractsPath
   # - @id     - A string representing the joined ref and path
   # - @ref    - A string representing the ref (e.g., the branch, tag, or commit SHA)
   # - @path   - A string representing the filesystem path
-  # - @commit - A CommitDecorator representing the commit from the given ref
-  # - @tree   - A TreeDecorator representing the tree at the given ref/path
+  # - @commit - A Commit representing the commit from the given ref
+  # - @tree   - A Tree representing the tree at the given ref/path
   #
   # If the :id parameter appears to be requesting a specific response format,
   # that will be handled as well.
@@ -100,11 +100,9 @@ module ExtractsPath
     # It is used "@project.repository.commits(@ref, @path, 1, 0)",
     # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
-    commits = @project.repository.commits(@ref, @path, 1, 0)
-    @commit = CommitDecorator.decorate(commits.first)
+    @commit = @project.repository.commits(@ref, @path, 1, 0).first
     @tree = Tree.new(@commit.tree, @ref, @path)
-    @tree = TreeDecorator.new(@tree)
     raise InvalidPathError if @tree.invalid?
   rescue RuntimeError, NoMethodError, InvalidPathError
@@ -0,0 +1,22 @@
+module Gitlab
+  module Git
+    class Blame
+
+      attr_accessor :repository, :sha, :path
+
+      def initialize(repository, sha, path)
+        @repository, @sha, @path = repository, sha, path
+
+      end
+
+      def each
+        raw_blame = Grit::Blob.blame(repository.repo, sha, path)
+
+        raw_blame.each do |commit, lines|
+          commit = Gitlab::Git::Commit.new(commit)
+          yield(commit, lines)
+        end
+      end
+    end
+  end
+end
@@ -0,0 +1,153 @@
+# Gitlab::Git::Commit is a wrapper around native Grit::Commit object
+# We dont want to use grit objects inside app/
+# It helps us easily migrate to rugged in future
+module Gitlab
+  module Git
+    class Commit
+      attr_accessor :raw_commit, :head, :refs
+
+      delegate  :message, :authored_date, :committed_date, :parents, :sha,
+        :date, :committer, :author, :diffs, :tree, :id, :stats, :to_patch,
+        to: :raw_commit
+
+      class << self
+        def find_or_first(repo, commit_id = nil, root_ref)
+          commit = if commit_id
+                     repo.commit(commit_id)
+                   else
+                     repo.commits(root_ref).first
+                   end
+
+          Commit.new(commit) if commit
+        end
+
+        def fresh_commits(repo, n = 10)
+          commits = repo.heads.map do |h|
+            repo.commits(h.name, n).map { |c| Commit.new(c, h) }
+          end.flatten.uniq { |c| c.id }
+
+          commits.sort! do |x, y|
+            y.committed_date <=> x.committed_date
+          end
+
+          commits[0...n]
+        end
+
+        def commits_with_refs(repo, n = 20)
+          commits = repo.branches.map { |ref| Commit.new(ref.commit, ref) }
+
+          commits.sort! do |x, y|
+            y.committed_date <=> x.committed_date
+          end
+
+          commits[0..n]
+        end
+
+        def commits_since(repo, date)
+          commits = repo.heads.map do |h|
+            repo.log(h.name, nil, since: date).each { |c| Commit.new(c, h) }
+          end.flatten.uniq { |c| c.id }
+
+          commits.sort! do |x, y|
+            y.committed_date <=> x.committed_date
+          end
+
+          commits
+        end
+
+        def commits(repo, ref, path = nil, limit = nil, offset = nil)
+          if path
+            repo.log(ref, path, max_count: limit, skip: offset)
+          elsif limit && offset
+            repo.commits(ref, limit, offset)
+          else
+            repo.commits(ref)
+          end.map{ |c| Commit.new(c) }
+        end
+
+        def commits_between(repo, from, to)
+          repo.commits_between(from, to).map { |c| Commit.new(c) }
+        end
+      end
+
+      def initialize(raw_commit, head = nil)
+        raise "Nil as raw commit passed" unless raw_commit
+
+        @raw_commit = raw_commit
+        @head = head
+      end
+
+      def short_id(length = 10)
+        id.to_s[0..length]
+      end
+
+      def safe_message
+        @safe_message ||= message
+      end
+
+      def created_at
+        committed_date
+      end
+
+      def author_email
+        author.email
+      end
+
+      def author_name
+        author.name
+      end
+
+      # Was this commit committed by a different person than the original author?
+      def different_committer?
+        author_name != committer_name || author_email != committer_email
+      end
+
+      def committer_name
+        committer.name
+      end
+
+      def committer_email
+        committer.email
+      end
+
+      def prev_commit
+        @prev_commit ||= if parents.present?
+                           Commit.new(parents.first)
+                         else
+                           nil
+                         end
+      end
+
+      def prev_commit_id
+        prev_commit.try :id
+      end
+
+      # Shows the diff between the commit's parent and the commit.
+      #
+      # Cuts out the header and stats from #to_patch and returns only the diff.
+      def to_diff
+        # see Grit::Commit#show
+        patch = to_patch
+
+        # discard lines before the diff
+        lines = patch.split("\n")
+        while !lines.first.start_with?("diff --git") do
+          lines.shift
+        end
+        lines.pop if lines.last =~ /^[\d.]+$/ # Git version
+          lines.pop if lines.last == "-- "      # end of diff
+        lines.join("\n")
+      end
+
+      def has_zero_stats?
+        stats.total.zero?
+      rescue
+        true
+      end
+
+      def no_commit_message
+        "--no commit message"
+      end
+    end
+  end
+end
@@ -0,0 +1,37 @@
+module Gitlab
+  module Git
+    class Compare
+      attr_accessor :commits, :commit, :diffs, :same
+
+      def initialize(repository, from, to)
+        @commits, @diffs = [], []
+        @commit = nil
+        @same = false
+
+        return unless from && to
+
+        first = repository.commit(to.try(:strip))
+        last = repository.commit(from.try(:strip))
+
+        return unless first && last
+
+        if first.id == last.id
+          @same = true
+          return
+        end
+
+        @commit = Commit.new(first)
+
+        @commits = repository.commits_between(last.id, first.id)
+        @commits = @commits.map { |c| Commit.new(c) }
+
+        @diffs = if @commits.size > 100
+                   []
+                 else
+                   repository.repo.diff(last.id, first.id) rescue []
+                 end
+      end
+    end
+  end
+end
+
@@ -0,0 +1,185 @@
+# Gitlab::Git::Gitlab::Git::Commit is a wrapper around native Grit::Repository object
+# We dont want to use grit objects inside app/
+# It helps us easily migrate to rugged in future
+module Gitlab
+  module Git
+    class Repository
+      include Gitlab::Popen
+
+      class NoRepository < StandardError; end
+
+      # Repository directory name with namespace direcotry
+      # Examples:
+      #   gitlab/gitolite
+      #   diaspora
+      #
+      attr_accessor :path_with_namespace
+
+      # Grit repo object
+      attr_accessor :repo
+
+      # Default branch in the repository
+      attr_accessor :root_ref
+
+      def initialize(path_with_namespace, root_ref = 'master')
+        @root_ref = root_ref || "master"
+        @path_with_namespace = path_with_namespace
+
+        # Init grit repo object
+        repo
+      end
+
+      def raw
+        repo
+      end
+
+      def path_to_repo
+        @path_to_repo ||= File.join(repos_path, "#{path_with_namespace}.git")
+      end
+
+      def repos_path
+        Gitlab.config.gitlab_shell.repos_path
+      end
+
+      def repo
+        @repo ||= Grit::Repo.new(path_to_repo)
+      rescue Grit::NoSuchPathError
+        raise NoRepository.new('no repository for such path')
+      end
+
+      def commit(commit_id = nil)
+        Gitlab::Git::Commit.find_or_first(repo, commit_id, root_ref)
+      end
+
+      def fresh_commits(n = 10)
+        Gitlab::Git::Commit.fresh_commits(repo, n)
+      end
+
+      def commits_with_refs(n = 20)
+        Gitlab::Git::Commit.commits_with_refs(repo, n)
+      end
+
+      def commits_since(date)
+        Gitlab::Git::Commit.commits_since(repo, date)
+      end
+
+      def commits(ref, path = nil, limit = nil, offset = nil)
+        Gitlab::Git::Commit.commits(repo, ref, path, limit, offset)
+      end
+
+      def last_commit_for(ref, path = nil)
+        commits(ref, path, 1).first
+      end
+
+      def commits_between(from, to)
+        Gitlab::Git::Commit.commits_between(repo, from, to)
+      end
+
+      # Returns an Array of branch names
+      # sorted by name ASC
+      def branch_names
+        branches.map(&:name)
+      end
+
+      # Returns an Array of Branches
+      def branches
+        repo.branches.sort_by(&:name)
+      end
+
+      # Returns an Array of tag names
+      def tag_names
+        repo.tags.collect(&:name).sort.reverse
+      end
+
+      # Returns an Array of Tags
+      def tags
+        repo.tags.sort_by(&:name).reverse
+      end
+
+      # Returns an Array of branch and tag names
+      def ref_names
+        [branch_names + tag_names].flatten
+      end
+
+      def heads
+        @heads ||= repo.heads
+      end
+
+      def tree(fcommit, path = nil)
+        fcommit = commit if fcommit == :head
+        tree = fcommit.tree
+        path ? (tree / path) : tree
+      end
+
+      def has_commits?
+        !!commit
+      rescue Grit::NoSuchPathError
+        false
+      end
+
+      def empty?
+        !has_commits?
+      end
+
+      # Discovers the default branch based on the repository's available branches
+      #
+      # - If no branches are present, returns nil
+      # - If one branch is present, returns its name
+      # - If two or more branches are present, returns the one that has a name
+      #   matching root_ref (default_branch or 'master' if default_branch is nil)
+      def discover_default_branch
+        if branch_names.length == 0
+          nil
+        elsif branch_names.length == 1
+          branch_names.first
+        else
+          branch_names.select { |v| v == root_ref }.first
+        end
+      end
+
+      # Archive Project to .tar.gz
+      #
+      # Already packed repo archives stored at
+      # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
+      #
+      def archive_repo(ref)
+        ref = ref || self.root_ref
+        commit = self.commit(ref)
+        return nil unless commit
+
+        # Build file path
+        file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
+        storage_path = Rails.root.join("tmp", "repositories")
+        file_path = File.join(storage_path, self.path_with_namespace, file_name)
+
+        # Put files into a directory before archiving
+        prefix = File.basename(self.path_with_namespace) + "/"
+
+        # Create file if not exists
+        unless File.exists?(file_path)
+          FileUtils.mkdir_p File.dirname(file_path)
+          file = self.repo.archive_to_file(ref, prefix,  file_path)
+        end
+
+        file_path
+      end
+
+      # Return repo size in megabytes
+      # Cached in redis
+      def size
+        Rails.cache.fetch(cache_key(:size)) do
+          size = popen('du -s', path_to_repo).first.strip.to_i
+          (size.to_f / 1024).round(2)
+        end
+      end
+
+      def expire_cache
+        Rails.cache.delete(cache_key(:size))
+      end
+
+      def cache_key(type)
+        "#{type}:#{path_with_namespace}"
+      end
+    end
+  end
+end
@@ -187,7 +187,7 @@ module Gitlab
     def reference_commit(identifier)
       if @project.valid_repo? && commit = @project.repository.commit(identifier)
-        link_to(identifier, project_commit_url(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
+        link_to(identifier, project_commit_url(@project, commit), html_options.merge(title: commit.link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
     end
   end
@@ -0,0 +1,6 @@
+namespace :cache do
+  desc "GITLAB | Clear redis cache"
+  task :clear => :environment do
+    Rails.cache.clear
+  end
+end
 require 'spec_helper'
 describe CommitController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:commit)  { project.repository.last_commit_for("master") }
 require 'spec_helper'
 describe CommitsController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   before do
 require 'spec_helper'
 describe MergeRequestsController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
 require 'spec_helper'
 describe TreeController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   before do
@@ -34,6 +34,10 @@ FactoryGirl.define do
     issues_tracker_id { "project_name_in_redmine" }
   end
+  factory :project_with_code, parent: :project do
+    path { 'gitlabhq' }
+  end
+
   factory :group do
     sequence(:name) { |n| "group#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
@@ -73,7 +77,7 @@ FactoryGirl.define do
   factory :merge_request do
     title
     author
-    project
+    project factory: :project_with_code
     source_branch "master"
     target_branch "stable"
@@ -82,9 +86,9 @@ FactoryGirl.define do
       target_branch "master" # pretend bcf03b5d~3
       source_branch "stable" # pretend bcf03b5d
       st_commits do
-        [Commit.new(project.repo.commit('bcf03b5d')),
-         Commit.new(project.repo.commit('bcf03b5d~1')),
-         Commit.new(project.repo.commit('bcf03b5d~2'))]
+        [Commit.new(project.repository.commit('bcf03b5d')),
+         Commit.new(project.repository.commit('bcf03b5d~1')),
+         Commit.new(project.repository.commit('bcf03b5d~2'))]
       end
       st_diffs do
         project.repo.diff("bcf03b5d~3", "bcf03b5d")
@@ -116,6 +120,7 @@ FactoryGirl.define do
     factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff]
     trait :on_commit do
+      project factory: :project_with_code
       commit_id     "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
       noteable_type "Commit"
     end
@@ -125,6 +130,7 @@ FactoryGirl.define do
     end
     trait :on_merge_request do
+      project factory: :project_with_code
       noteable_id   1
       noteable_type "MergeRequest"
     end
 require 'spec_helper'
 describe "Gitlab Flavored Markdown" do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:issue) { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:fred) do
 require 'spec_helper'
 describe "On a merge request", js: true do
-  let!(:project) { create(:project) }
+  let!(:project) { create(:project_with_code) }
   let!(:merge_request) { create(:merge_request, project: project) }
   before do
@@ -83,7 +83,7 @@ end
 describe "On a merge request diff", js: true, focus: true do
-  let!(:project) { create(:project) }
+  let!(:project) { create(:project_with_code) }
   let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
   before do
@@ -12,8 +12,9 @@ describe &quot;Profile account page&quot; do
       Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
       visit account_profile_path
     end
+
     it { page.should have_content("Remove account") }
-    
+
     it "should delete the account", js: true do
       expect { click_link "Delete account" }.to change {User.count}.by(-1)
       current_path.should == new_user_session_path
@@ -45,4 +46,4 @@ describe &quot;Profile account page&quot; do
       current_path.should == account_profile_path
     end
   end
-end
 \ No newline at end of file
+end
@@ -14,7 +14,7 @@ describe &quot;Application access&quot; do
   end
   describe "Project" do
-    let(:project)  { create(:project) }
+    let(:project)  { create(:project_with_code) }
     let(:master)   { create(:user) }
     let(:guest)    { create(:user) }
@@ -4,10 +4,10 @@ describe GitlabMarkdownHelper do
   include ApplicationHelper
   include IssuesHelper
-  let!(:project) { create(:project) }
+  let!(:project) { create(:project_with_code) }
   let(:user)          { create(:user, username: 'gfm') }
-  let(:commit)        { CommitDecorator.decorate(project.repository.commit) }
+  let(:commit)        { project.repository.commit }
   let(:issue)         { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:snippet)       { create(:snippet, project: project) }
@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Gitlab::Git::Commit do
+  let(:commit) { create(:project_with_code).repository.commit }
+
+  describe "Commit info" do
+    before do
+      @committer = double(
+        email: 'mike@smith.com',
+        name: 'Mike Smith'
+      )
+
+      @author = double(
+        email: 'john@smith.com',
+        name: 'John Smith'
+      )
+
+      @raw_commit = double(
+        id: "bcf03b5de6abcf03b5de6c",
+        author: @author,
+        committer: @committer,
+        committed_date: Date.yesterday,
+        message: 'Refactoring specs'
+      )
+
+      @commit = Gitlab::Git::Commit.new(@raw_commit)
+    end
+
+    it { @commit.short_id.should == "bcf03b5de6a" }
+    it { @commit.safe_message.should == @raw_commit.message }
+    it { @commit.created_at.should == @raw_commit.committed_date }
+    it { @commit.author_email.should == @author.email }
+    it { @commit.author_name.should == @author.name }
+    it { @commit.committer_name.should == @committer.name }
+    it { @commit.committer_email.should == @committer.email }
+    it { @commit.different_committer?.should be_true }
+  end
+
+  describe "Class methods" do
+    subject { Gitlab::Git::Commit }
+
+    it { should respond_to(:find_or_first) }
+    it { should respond_to(:fresh_commits) }
+    it { should respond_to(:commits_with_refs) }
+    it { should respond_to(:commits_since) }
+    it { should respond_to(:commits_between) }
+    it { should respond_to(:commits) }
+  end
+end
@@ -0,0 +1,104 @@
+require "spec_helper"
+
+describe Gitlab::Git::Repository do
+  let(:repository) { Gitlab::Git::Repository.new('gitlabhq', 'master') }
+
+  describe "Respond to" do
+    subject { repository }
+
+    it { should respond_to(:repo) }
+    it { should respond_to(:tree) }
+    it { should respond_to(:root_ref) }
+    it { should respond_to(:tags) }
+    it { should respond_to(:commit) }
+    it { should respond_to(:commits) }
+    it { should respond_to(:commits_between) }
+    it { should respond_to(:commits_with_refs) }
+    it { should respond_to(:commits_since) }
+    it { should respond_to(:commits_between) }
+  end
+
+
+  describe "#discover_default_branch" do
+    let(:master) { 'master' }
+    let(:stable) { 'stable' }
+
+    it "returns 'master' when master exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
+      repository.discover_default_branch.should == 'master'
+    end
+
+    it "returns non-master when master exists but default branch is set to something else" do
+      repository.root_ref = 'stable'
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
+      repository.discover_default_branch.should == 'stable'
+    end
+
+    it "returns a non-master branch when only one exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable])
+      repository.discover_default_branch.should == 'stable'
+    end
+
+    it "returns nil when no branch exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([])
+      repository.discover_default_branch.should be_nil
+    end
+  end
+
+  describe :commit do
+    it "should return first head commit if without params" do
+      repository.commit.id.should == repository.repo.commits.first.id
+    end
+
+    it "should return valid commit" do
+      repository.commit(ValidCommit::ID).should be_valid_commit
+    end
+
+    it "should return nil" do
+      repository.commit("+123_4532530XYZ").should be_nil
+    end
+  end
+
+  describe :tree do
+    before do
+      @commit = repository.commit(ValidCommit::ID)
+    end
+
+    it "should raise error w/o arguments" do
+      lambda { repository.tree }.should raise_error
+    end
+
+    it "should return root tree for commit" do
+      tree = repository.tree(@commit)
+      tree.contents.size.should == ValidCommit::FILES_COUNT
+      tree.contents.map(&:name).should == ValidCommit::FILES
+    end
+
+    it "should return root tree for commit with correct path" do
+      tree = repository.tree(@commit, ValidCommit::C_FILE_PATH)
+      tree.contents.map(&:name).should == ValidCommit::C_FILES
+    end
+
+    it "should return root tree for commit with incorrect path" do
+      repository.tree(@commit, "invalid_path").should be_nil
+    end
+  end
+
+  describe "fresh commits" do
+    it { repository.fresh_commits(3).count.should == 3 }
+    it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
+    it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
+  end
+
+  describe "commits_between" do
+    subject do
+      commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
+                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
+      commits.map { |c| c.id }
+    end
+
+    it { should have(3).elements }
+    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
+    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
+  end
+end
@@ -5,7 +5,7 @@ describe Notify do
   include EmailSpec::Matchers
   let(:recipient) { create(:user, email: 'recipient@example.com') }
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   shared_examples 'a multiple recipients email' do
     it 'is sent to the given recipient' do
@@ -277,14 +277,7 @@ describe Notify do
       end
       describe 'on a commit' do
-        let(:commit) do
-          mock(:commit).tap do |commit|
-            commit.stub(:id).and_return('fauxsha1')
-            commit.stub(:project).and_return(project)
-            commit.stub(:short_id).and_return('fauxsha1')
-            commit.stub(:safe_message).and_return('some message')
-          end
-        end
+        let(:commit) { project.repository.commit }
         before(:each) { note.stub(:noteable).and_return(commit) }
@@ -297,7 +290,7 @@ describe Notify do
         end
         it 'contains a link to the commit' do
-          should have_body_text /fauxsha1/
+          should have_body_text commit.short_id
         end
       end
 require 'spec_helper'
 describe Commit do
-  let(:commit) { create(:project).repository.commit }
+  let(:commit) { create(:project_with_code).repository.commit }
-  describe CommitDecorator do
-    let(:decorator) { CommitDecorator.new(commit) }
-    describe '#title' do
-      it "returns no_commit_message when safe_message is blank" do
-        decorator.stub(:safe_message).and_return('')
-        decorator.title.should == "--no commit message"
-      end
-
-      it "truncates a message without a newline at 70 characters" do
-        message = commit.safe_message * 10
-
-        decorator.stub(:safe_message).and_return(message)
-        decorator.title.should == "#{message[0..69]}&hellip;"
-      end
-
-      it "truncates a message with a newline before 80 characters at the newline" do
-        message = commit.safe_message.split(" ").first
-
-        decorator.stub(:safe_message).and_return(message + "\n" + message)
-        decorator.title.should == message
-      end
-
-      it "truncates a message with a newline after 80 characters at 70 characters" do
-        message = (commit.safe_message * 10) + "\n"
-
-        decorator.stub(:safe_message).and_return(message)
-        decorator.title.should == "#{message[0..69]}&hellip;"
-      end
+  describe '#title' do
+    it "returns no_commit_message when safe_message is blank" do
+      commit.stub(:safe_message).and_return('')
+      commit.title.should == "--no commit message"
     end
-  end
-  describe "Commit info" do
-    before do
-      @committer = double(
-        email: 'mike@smith.com',
-        name: 'Mike Smith'
-      )
+    it "truncates a message without a newline at 70 characters" do
+      message = commit.safe_message * 10
-      @author = double(
-        email: 'john@smith.com',
-        name: 'John Smith'
-      )
+      commit.stub(:safe_message).and_return(message)
+      commit.title.should == "#{message[0..69]}&hellip;"
+    end
-      @raw_commit = double(
-        id: "bcf03b5de6abcf03b5de6c",
-        author: @author,
-        committer: @committer,
-        committed_date: Date.yesterday,
-        message: 'Refactoring specs'
-      )
+    it "truncates a message with a newline before 80 characters at the newline" do
+      message = commit.safe_message.split(" ").first
-      @commit = Commit.new(@raw_commit)
+      commit.stub(:safe_message).and_return(message + "\n" + message)
+      commit.title.should == message
     end
-    it { @commit.short_id.should == "bcf03b5de6a" }
-    it { @commit.safe_message.should == @raw_commit.message }
-    it { @commit.created_at.should == @raw_commit.committed_date }
-    it { @commit.author_email.should == @author.email }
-    it { @commit.author_name.should == @author.name }
-    it { @commit.committer_name.should == @committer.name }
-    it { @commit.committer_email.should == @committer.email }
-    it { @commit.different_committer?.should be_true }
-  end
+    it "truncates a message with a newline after 80 characters at 70 characters" do
+      message = (commit.safe_message * 10) + "\n"
-  describe "Class methods" do
-    subject { Commit }
-
-    it { should respond_to(:find_or_first) }
-    it { should respond_to(:fresh_commits) }
-    it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
-    it { should respond_to(:commits) }
-    it { should respond_to(:compare) }
+      commit.stub(:safe_message).and_return(message)
+      commit.title.should == "#{message[0..69]}&hellip;"
+    end
   end
   describe "delegation" do
@@ -81,7 +81,7 @@ describe GollumWiki do
     end
     it "raises CouldNotCreateWikiError if it can't create the wiki repository" do
-      Gitlab::Shell.any_instance.stub(:add_repository).and_return(false)
+      GollumWiki.any_instance.stub(:init_repo).and_return(false)
       expect { GollumWiki.new(project, user).wiki }.to raise_exception(GollumWiki::CouldNotCreateWikiError)
     end
   end
@@ -119,7 +119,7 @@ describe Project do
   end
   describe :update_merge_requests do
-    let(:project) { create(:project) }
+    let(:project) { create(:project_with_code) }
     before do
       @merge_request = create(:merge_request, project: project)
@@ -189,10 +189,6 @@ describe Project do
     it "should return valid repo" do
       project.repository.should be_kind_of(Repository)
     end
-
-    it "should return nil" do
-      Project.new(path: "empty").repository.should be_nil
-    end
   end
   describe :issue_exists? do
@@ -249,7 +245,7 @@ describe Project do
   end
   describe :open_branches do
-    let(:project) { create(:project) }
+    let(:project) { create(:project_with_code) }
     before do
       project.protected_branches.create(name: 'master')
@@ -1,105 +0,0 @@
-require "spec_helper"
-
-describe Repository do
-  let(:project) { create(:project) }
-  let(:repository) { project.repository }
-
-  describe "Respond to" do
-    subject { repository }
-
-    it { should respond_to(:repo) }
-    it { should respond_to(:tree) }
-    it { should respond_to(:root_ref) }
-    it { should respond_to(:tags) }
-    it { should respond_to(:commit) }
-    it { should respond_to(:commits) }
-    it { should respond_to(:commits_between) }
-    it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
-  end
-
-
-  describe "#discover_default_branch" do
-    let(:master) { 'master' }
-    let(:stable) { 'stable' }
-
-    it "returns 'master' when master exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      repository.discover_default_branch.should == 'master'
-    end
-
-    it "returns non-master when master exists but default branch is set to something else" do
-      repository.root_ref = 'stable'
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      repository.discover_default_branch.should == 'stable'
-    end
-
-    it "returns a non-master branch when only one exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable])
-      repository.discover_default_branch.should == 'stable'
-    end
-
-    it "returns nil when no branch exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([])
-      repository.discover_default_branch.should be_nil
-    end
-  end
-
-  describe :commit do
-    it "should return first head commit if without params" do
-      repository.commit.id.should == repository.repo.commits.first.id
-    end
-
-    it "should return valid commit" do
-      repository.commit(ValidCommit::ID).should be_valid_commit
-    end
-
-    it "should return nil" do
-      repository.commit("+123_4532530XYZ").should be_nil
-    end
-  end
-
-  describe :tree do
-    before do
-      @commit = repository.commit(ValidCommit::ID)
-    end
-
-    it "should raise error w/o arguments" do
-      lambda { repository.tree }.should raise_error
-    end
-
-    it "should return root tree for commit" do
-      tree = repository.tree(@commit)
-      tree.contents.size.should == ValidCommit::FILES_COUNT
-      tree.contents.map(&:name).should == ValidCommit::FILES
-    end
-
-    it "should return root tree for commit with correct path" do
-      tree = repository.tree(@commit, ValidCommit::C_FILE_PATH)
-      tree.contents.map(&:name).should == ValidCommit::C_FILES
-    end
-
-    it "should return root tree for commit with incorrect path" do
-      repository.tree(@commit, "invalid_path").should be_nil
-    end
-  end
-
-  describe "fresh commits" do
-    it { repository.fresh_commits(3).count.should == 3 }
-    it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
-    it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
-  end
-
-  describe "commits_between" do
-    subject do
-      commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
-                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
-      commits.map { |c| c.id }
-    end
-
-    it { should have(3).elements }
-    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
-    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
-  end
-end
@@ -4,7 +4,7 @@ describe Gitlab::API do
   include ApiHelpers
   let(:user) { create(:user ) }
-  let!(:project) { create(:project, namespace: user.namespace ) }
+  let!(:project) { create(:project_with_code, creator_id: user.id) }
   let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") }
   before { project.team << [user, :reporters] }
@@ -7,7 +7,7 @@ describe Gitlab::API do
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
   let(:admin) { create(:admin) }
-  let!(:project) { create(:project, namespace: user.namespace ) }
+  let!(:project) { create(:project_with_code, creator_id: user.id) }
   let!(:hook) { create(:project_hook, project: project, url: "http://example.com") }
   let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
   let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
@@ -2,7 +2,7 @@ require &#39;spec_helper&#39;
 describe GitPushService do
   let (:user)          { create :user }
-  let (:project)       { create :project }
+  let (:project)       { create :project_with_code }
   let (:service) { GitPushService.new }
   before do
@@ -47,11 +47,7 @@ Spork.prefork do
     config.use_transactional_fixtures = false
     config.before do
-      # Use tmp dir for FS manipulations
-      temp_repos_path = Rails.root.join('tmp', 'test-git-base-path')
-      Gitlab.config.gitlab_shell.stub(repos_path: temp_repos_path)
-      FileUtils.rm_rf temp_repos_path
-      FileUtils.mkdir_p temp_repos_path
+      TestEnv.init
     end
   end
 end
@@ -1,75 +0,0 @@
-require "repository"
-require "project"
-require "merge_request"
-require "shell"
-
-# Stubs out all Git repository access done by models so that specs can run
-# against fake repositories without Grit complaining that they don't exist.
-class Project
-  def repository
-    if path == "empty" || !path
-      nil
-    else
-      GitLabTestRepo.new(path_with_namespace)
-    end
-  end
-
-  def satellite
-    FakeSatellite.new
-  end
-
-  class FakeSatellite
-    def exists?
-      true
-    end
-
-    def destroy
-      true
-    end
-
-    def create
-      true
-    end
-  end
-end
-
-class MergeRequest
-  def check_if_can_be_merged
-    true
-  end
-end
-
-class GitLabTestRepo < Repository
-  def repo
-    @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
-  end
-
-  # patch repo size (in mb)
-  def size
-    12.45
-  end
-end
-
-module Gitlab
-  class Shell
-    def add_repository name
-      true
-    end
-
-    def mv_repository name, new_name
-      true
-    end
-
-    def remove_repository name
-      true
-    end
-
-    def add_key id, key
-      true
-    end
-
-    def remove_key id, key
-      true
-    end
-  end
-end
@@ -0,0 +1,63 @@
+module TestEnv
+  extend self
+
+  # Test environment
+  #
+  # all repositories and namespaces stored at
+  # RAILS_APP/tmp/test-git-base-path
+  #
+  # Next shell methods are stubbed and return true
+  # -  mv_repository
+  # -  remove_repository
+  # -  add_key
+  # -  remove_key
+  #
+  def init
+    # Use tmp dir for FS manipulations
+    repos_path = Rails.root.join('tmp', 'test-git-base-path')
+    Gitlab.config.gitlab_shell.stub(repos_path: repos_path)
+
+    GollumWiki.any_instance.stub(:init_repo) do |path|
+      create_temp_repo(File.join(repos_path, "#{path}.git"))
+    end
+
+    Gitlab::Shell.any_instance.stub(
+      add_repository: true,
+      mv_repository: true,
+      remove_repository: true,
+      add_key: true,
+      remove_key: true
+    )
+
+    Gitlab::Satellite::Satellite.any_instance.stub(
+      exists?: true,
+      destroy: true,
+      create: true
+    )
+
+    MergeRequest.any_instance.stub(
+      check_if_can_be_merged: true
+    )
+
+    Repository.any_instance.stub(
+      size: 12.45
+    )
+
+    # Remove tmp/test-git-base-path
+    FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path
+
+    # Recreate tmp/test-git-base-path
+    FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
+
+    # Symlink tmp/repositories/gitlabhq to tmp/test-git-base-path/gitlabhq
+    seed_repo = Rails.root.join('tmp', 'repositories', 'gitlabhq')
+    target_repo = File.join(repos_path, 'gitlabhq.git')
+    system("ln -s #{seed_repo} #{target_repo}")
+  end
+
+  def create_temp_repo(path)
+    FileUtils.mkdir_p path
+    command = "git init --quiet --bare #{path};"
+    system(command)
+  end
+end
@@ -9,7 +9,7 @@ describe PostReceive do
   end
   context "web hook" do
-    let(:project) { create(:project) }
+    let(:project) { create(:project_with_code) }
     let(:key) { create(:key, user: project.owner) }
     let(:key_id) { key.shell_id }
	@@ -12,7 +12,6 @@ class CommitLoadContext < BaseContext		@@ -12,7 +12,6 @@ class CommitLoadContext < BaseContext
12	commit = project.repository.commit(params[:id])	12	commit = project.repository.commit(params[:id])
13		13
14	if commit	14	if commit
15	- commit = CommitDecorator.decorate(commit)
16	line_notes = project.notes.for_commit_id(commit.id).inline	15	line_notes = project.notes.for_commit_id(commit.id).inline
17		16
18	result[:commit] = commit	17	result[:commit] = commit
	@@ -8,7 +8,6 @@ class BlameController < ProjectResourceController		@@ -8,7 +8,6 @@ class BlameController < ProjectResourceController
8	before_filter :require_non_empty_project	8	before_filter :require_non_empty_project
9		9
10	def show	10	def show
11	- @repo = @project.repo
12	- @blame = Grit::Blob.blame(@repo, @commit.id, @path)	11	+ @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
13	end	12	end
14	end	13	end
	@@ -13,7 +13,6 @@ class CommitsController < ProjectResourceController		@@ -13,7 +13,6 @@ class CommitsController < ProjectResourceController
13	@limit, @offset = (params[:limit] \|\| 40), (params[:offset] \|\| 0)	13	@limit, @offset = (params[:limit] \|\| 40), (params[:offset] \|\| 0)
14		14
15	@commits = @repo.commits(@ref, @path, @limit, @offset)	15	@commits = @repo.commits(@ref, @path, @limit, @offset)
16	- @commits = CommitDecorator.decorate_collection(@commits)
17		16
18	respond_to do \|format\|	17	respond_to do \|format\|
19	format.html # index.html.erb	18	format.html # index.html.erb
	@@ -1,93 +0,0 @@	@@ -1,93 +0,0 @@
1	-class CommitDecorator < ApplicationDecorator
2	- decorates :commit
3	-
4	- # Returns a string describing the commit for use in a link title
5	- #
6	- # Example
7	- #
8	- # "Commit: Alex Denisov - Project git clone panel"
9	- def link_title
10	- "Commit: #{author_name} - #{title}"
11	- end
12	-
13	- # Returns the commits title.
14	- #
15	- # Usually, the commit title is the first line of the commit message.
16	- # In case this first line is longer than 80 characters, it is cut off
17	- # after 70 characters and ellipses (`&hellp;`) are appended.
18	- def title
19	- title = safe_message
20	-
21	- return no_commit_message if title.blank?
22	-
23	- title_end = title.index(/\n/)
24	- if (!title_end && title.length > 80) \|\| (title_end && title_end > 80)
25	- title[0..69] << "…".html_safe
26	- else
27	- title.split(/\n/, 2).first
28	- end
29	- end
30	-
31	- # Returns the commits description
32	- #
33	- # cut off, ellipses (`&hellp;`) are prepended to the commit message.
34	- def description
35	- description = safe_message
36	-
37	- title_end = description.index(/\n/)
38	- if (!title_end && description.length > 80) \|\| (title_end && title_end > 80)
39	- "…".html_safe << description[70..-1]
40	- else
41	- description.split(/\n/, 2)[1].try(:chomp)
42	- end
43	- end
44	-
45	- # Returns a link to the commit author. If the author has a matching user and
46	- # is a member of the current @project it will link to the team member page.
47	- # Otherwise it will link to the author email as specified in the commit.
48	- #
49	- # options:
50	- # avatar: true will prepend the avatar image
51	- # size: size of the avatar image in px
52	- def author_link(options = {})
53	- person_link(options.merge source: :author)
54	- end
55	-
56	- # Just like #author_link but for the committer.
57	- def committer_link(options = {})
58	- person_link(options.merge source: :committer)
59	- end
60	-
61	- protected
62	-
63	- def no_commit_message
64	- "--no commit message"
65	- end
66	-
67	- # Private: Returns a link to a person. If the person has a matching user and
68	- # is a member of the current @project it will link to the team member page.
69	- # Otherwise it will link to the person email as specified in the commit.
70	- #
71	- # options:
72	- # source: one of :author or :committer
73	- # avatar: true will prepend the avatar image
74	- # size: size of the avatar image in px
75	- def person_link(options = {})
76	- source_name = send "#{options[:source]}_name".to_sym
77	- source_email = send "#{options[:source]}_email".to_sym
78	- text = if options[:avatar]
79	- avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: ""
80	- %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
81	- else
82	- source_name
83	- end
84	-
85	- user = User.where('name like ? or email like ?', source_name, source_email).first
86	-
87	- if user.nil?
88	- h.mail_to(source_email, text.html_safe, class: "commit-#{options[:source]}-link")
89	- else
90	- h.link_to(text.html_safe, h.user_path(user), class: "commit-#{options[:source]}-link")
91	- end
92	- end
93	-end
	@@ -1,33 +0,0 @@	@@ -1,33 +0,0 @@
1	-class TreeDecorator < ApplicationDecorator
2	- decorates :tree
3	-
4	- def breadcrumbs(max_links = 2)
5	- if path
6	- part_path = ""
7	- parts = path.split("\/")
8	-
9	- yield('..', nil) if parts.count > max_links
10	-
11	- parts.each do \|part\|
12	- part_path = File.join(part_path, part) unless part_path.empty?
13	- part_path = part if part_path.empty?
14	-
15	- next unless parts.last(2).include?(part) if parts.count > max_links
16	- yield(part, h.tree_join(ref, part_path))
17	- end
18	- end
19	- end
20	-
21	- def up_dir?
22	- path.present?
23	- end
24	-
25	- def up_dir_path
26	- file = File.join(path, "..")
27	- h.tree_join(ref, file)
28	- end
29	-
30	- def readme
31	- @readme \|\|= contents.find { \|c\| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
32	- end
33	-end
	@@ -96,7 +96,7 @@ module ApplicationHelper		@@ -96,7 +96,7 @@ module ApplicationHelper
96	]	96	]
97		97
98	project_nav = []	98	project_nav = []
99	- if @project && @project.repository && @project.repository.root_ref	99	+ if @project && @project.repository.exists? && @project.repository.root_ref
100	project_nav = [	100	project_nav = [
101	{ label: "#{simple_sanitize(@project.name_with_namespace)} - Issues", url: project_issues_path(@project) },	101	{ label: "#{simple_sanitize(@project.name_with_namespace)} - Issues", url: project_issues_path(@project) },
102	{ label: "#{simple_sanitize(@project.name_with_namespace)} - Commits", url: project_commits_path(@project, @ref \|\| @project.repository.root_ref) },	102	{ label: "#{simple_sanitize(@project.name_with_namespace)} - Commits", url: project_commits_path(@project, @ref \|\| @project.repository.root_ref) },
1	module CommitsHelper	1	module CommitsHelper
		2	+ # Returns a link to the commit author. If the author has a matching user and
		3	+ # is a member of the current @project it will link to the team member page.
		4	+ # Otherwise it will link to the author email as specified in the commit.
		5	+ #
		6	+ # options:
		7	+ # avatar: true will prepend the avatar image
		8	+ # size: size of the avatar image in px
		9	+ def commit_author_link(commit, options = {})
		10	+ commit_person_link(commit, options.merge(source: :author))
		11	+ end
		12	+
		13	+ # Just like #author_link but for the committer.
		14	+ def commit_committer_link(commit, options = {})
		15	+ commit_person_link(commit, options.merge(source: :committer))
		16	+ end
		17	+
2	def identification_type(line)	18	def identification_type(line)
3	if line[0] == "+"	19	if line[0] == "+"
4	"new"	20	"new"
	@@ -93,9 +109,7 @@ module CommitsHelper		@@ -93,9 +109,7 @@ module CommitsHelper
93	end	109	end
94		110
95	def commit_to_html commit	111	def commit_to_html commit
96	- if commit.model
97	- escape_javascript(render 'commits/commit', commit: commit)
98	- end	112	+ escape_javascript(render 'commits/commit', commit: commit)
99	end	113	end
100		114
101	def diff_line_content(line)	115	def diff_line_content(line)
	@@ -105,4 +119,58 @@ module CommitsHelper		@@ -105,4 +119,58 @@ module CommitsHelper
105	line	119	line
106	end	120	end
107	end	121	end
		122	+
		123	+ # Breadcrumb links for a Project and, if applicable, a tree path
		124	+ def commits_breadcrumbs
		125	+ return unless @project && @ref
		126	+
		127	+ # Add the root project link and the arrow icon
		128	+ crumbs = content_tag(:li) do
		129	+ content_tag(:span, nil, class: 'arrow') +
		130	+ link_to(@project.name, project_commits_path(@project, @ref))
		131	+ end
		132	+
		133	+ if @path
		134	+ parts = @path.split('/')
		135	+
		136	+ parts.each_with_index do \|part, i\|
		137	+ crumbs += content_tag(:span, '/', class: 'divider')
		138	+ crumbs += content_tag(:li) do
		139	+ # The text is just the individual part, but the link needs all the parts before it
		140	+ link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
		141	+ end
		142	+ end
		143	+ end
		144	+
		145	+ crumbs.html_safe
		146	+ end
		147	+
		148	+ protected
		149	+
		150	+ # Private: Returns a link to a person. If the person has a matching user and
		151	+ # is a member of the current @project it will link to the team member page.
		152	+ # Otherwise it will link to the person email as specified in the commit.
		153	+ #
		154	+ # options:
		155	+ # source: one of :author or :committer
		156	+ # avatar: true will prepend the avatar image
		157	+ # size: size of the avatar image in px
		158	+ def commit_person_link(commit, options = {})
		159	+ source_name = commit.send "#{options[:source]}_name".to_sym
		160	+ source_email = commit.send "#{options[:source]}_email".to_sym
		161	+ text = if options[:avatar]
		162	+ avatar = image_tag(gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
		163	+ %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
		164	+ else
		165	+ source_name
		166	+ end
		167	+
		168	+ user = User.where('name like ? or email like ?', source_name, source_email).first
		169	+
		170	+ if user.nil?
		171	+ mail_to(source_email, text.html_safe, class: "commit-#{options[:source]}-link")
		172	+ else
		173	+ link_to(text.html_safe, user_path(user), class: "commit-#{options[:source]}-link")
		174	+ end
		175	+ end
108	end	176	end
	@@ -8,174 +8,70 @@ class Commit		@@ -8,174 +8,70 @@ class Commit
8	#	8	#
9	DIFF_SAFE_SIZE = 100	9	DIFF_SAFE_SIZE = 100
10		10
11	- attr_accessor :commit, :head, :refs
12	-
13	- delegate :message, :authored_date, :committed_date, :parents, :sha,
14	- :date, :committer, :author, :diffs, :tree, :id, :stats,
15	- :to_patch, to: :commit
16	-
17	- class << self
18	- def find_or_first(repo, commit_id = nil, root_ref)
19	- commit = if commit_id
20	- repo.commit(commit_id)
21	- else
22	- repo.commits(root_ref).first
23	- end
24	-
25	- Commit.new(commit) if commit
26	- end
27	-
28	- def fresh_commits(repo, n = 10)
29	- commits = repo.heads.map do \|h\|
30	- repo.commits(h.name, n).map { \|c\| Commit.new(c, h) }
31	- end.flatten.uniq { \|c\| c.id }
32	-
33	- commits.sort! do \|x, y\|
34	- y.committed_date <=> x.committed_date
35	- end
36	-
37	- commits[0...n]
38	- end
39	-
40	- def commits_with_refs(repo, n = 20)
41	- commits = repo.branches.map { \|ref\| Commit.new(ref.commit, ref) }
42	-
43	- commits.sort! do \|x, y\|
44	- y.committed_date <=> x.committed_date
45	- end
46	-
47	- commits[0..n]
48	- end
49	-
50	- def commits_since(repo, date)
51	- commits = repo.heads.map do \|h\|
52	- repo.log(h.name, nil, since: date).each { \|c\| Commit.new(c, h) }
53	- end.flatten.uniq { \|c\| c.id }
54	-
55	- commits.sort! do \|x, y\|
56	- y.committed_date <=> x.committed_date
57	- end
58	-
59	- commits
60	- end
61	-
62	- def commits(repo, ref, path = nil, limit = nil, offset = nil)
63	- if path
64	- repo.log(ref, path, max_count: limit, skip: offset)
65	- elsif limit && offset
66	- repo.commits(ref, limit, offset)
67	- else
68	- repo.commits(ref)
69	- end.map{ \|c\| Commit.new(c) }
70	- end
71	-
72	- def commits_between(repo, from, to)
73	- repo.commits_between(from, to).map { \|c\| Commit.new(c) }
74	- end
75	-
76	- def compare(project, from, to)
77	- result = {
78	- commits: [],
79	- diffs: [],
80	- commit: nil,
81	- same: false
82	- }
83	-
84	- return result unless from && to
85	-
86	- first = project.repository.commit(to.try(:strip))
87	- last = project.repository.commit(from.try(:strip))
88	-
89	- if first && last
90	- result[:same] = (first.id == last.id)
91	- result[:commits] = project.repo.commits_between(last.id, first.id).map {\|c\| Commit.new(c)}
92	-
93	- # Dont load diff for 100+ commits
94	- result[:diffs] = if result[:commits].size > 100
95	- []
96	- else
97	- project.repo.diff(last.id, first.id) rescue []
98	- end
99	-
100	- result[:commit] = Commit.new(first)
101	- end
102	-
103	- result
104	- end
105	- end
106	-
107	- def initialize(raw_commit, head = nil)
108	- raise "Nil as raw commit passed" unless raw_commit
109	-
110	- @commit = raw_commit
111	- @head = head
112	- end
113	-
114	- def short_id(length = 10)
115	- id.to_s[0..length]	11	+ def self.decorate(commits)
		12	+ commits.map { \|c\| self.new(c) }
116	end	13	end
117		14
118	- def safe_message
119	- @safe_message \|\|= message
120	- end
121	-
122	- def created_at
123	- committed_date
124	- end	15	+ attr_accessor :raw
125		16
126	- def author_email
127	- author.email
128	- end	17	+ def initialize(raw_commit)
		18	+ raise "Nil as raw commit passed" unless raw_commit
129		19
130	- def author_name
131	- author.name	20	+ @raw = raw_commit
132	end	21	end
133		22
134	- # Was this commit committed by a different person than the original author?
135	- def different_committer?
136	- author_name != committer_name \|\| author_email != committer_email	23	+ def id
		24	+ @raw.id
137	end	25	end
138		26
139	- def committer_name
140	- committer.name	27	+ # Returns a string describing the commit for use in a link title
		28	+ #
		29	+ # Example
		30	+ #
		31	+ # "Commit: Alex Denisov - Project git clone panel"
		32	+ def link_title
		33	+ "Commit: #{author_name} - #{title}"
141	end	34	end
142		35
143	- def committer_email
144	- committer.email	36	+ # Returns the commits title.
		37	+ #
		38	+ # Usually, the commit title is the first line of the commit message.
		39	+ # In case this first line is longer than 80 characters, it is cut off
		40	+ # after 70 characters and ellipses (`&hellp;`) are appended.
		41	+ def title
		42	+ title = safe_message
		43	+
		44	+ return no_commit_message if title.blank?
		45	+
		46	+ title_end = title.index(/\n/)
		47	+ if (!title_end && title.length > 80) \|\| (title_end && title_end > 80)
		48	+ title[0..69] << "…".html_safe
		49	+ else
		50	+ title.split(/\n/, 2).first
		51	+ end
145	end	52	end
146		53
147	- def prev_commit
148	- @prev_commit \|\|= if parents.present?
149	- Commit.new(parents.first)
150	- else
151	- nil
152	- end	54	+ # Returns the commits description
		55	+ #
		56	+ # cut off, ellipses (`&hellp;`) are prepended to the commit message.
		57	+ def description
		58	+ description = safe_message
		59	+
		60	+ title_end = description.index(/\n/)
		61	+ if (!title_end && description.length > 80) \|\| (title_end && title_end > 80)
		62	+ "…".html_safe << description[70..-1]
		63	+ else
		64	+ description.split(/\n/, 2)[1].try(:chomp)
		65	+ end
153	end	66	end
154		67
155	- def prev_commit_id
156	- prev_commit.try :id	68	+ def method_missing(m, *args, &block)
		69	+ @raw.send(m, *args, &block)
157	end	70	end
158		71
159	- # Shows the diff between the commit's parent and the commit.
160	- #
161	- # Cuts out the header and stats from #to_patch and returns only the diff.
162	- def to_diff
163	- # see Grit::Commit#show
164	- patch = to_patch
165	-
166	- # discard lines before the diff
167	- lines = patch.split("\n")
168	- while !lines.first.start_with?("diff --git") do
169	- lines.shift
170	- end
171	- lines.pop if lines.last =~ /^[\d.]+$/ # Git version
172	- lines.pop if lines.last == "-- " # end of diff
173	- lines.join("\n")
174	- end	72	+ def respond_to?(method)
		73	+ return true if @raw.respond_to?(method)
175		74
176	- def has_zero_stats?
177	- stats.total.zero?
178	- rescue
179	- true	75	+ super
180	end	76	end
181	end	77	end
	@@ -8,7 +8,7 @@ module Network		@@ -8,7 +8,7 @@ module Network
8	attr_accessor :time, :spaces, :parent_spaces	8	attr_accessor :time, :spaces, :parent_spaces
9		9
10	def initialize(raw_commit, refs)	10	def initialize(raw_commit, refs)
11	- @commit = ::Commit.new(raw_commit)	11	+ @commit = Gitlab::Git::Commit.new(raw_commit)
12	@time = -1	12	@time = -1
13	@spaces = []	13	@spaces = []
14	@parent_spaces = []	14	@parent_spaces = []
1	class Repository	1	class Repository
2	- include Gitlab::Popen	2	+ attr_accessor :raw_repository
3		3
4	- # Repository directory name with namespace direcotry
5	- # Examples:
6	- # gitlab/gitolite
7	- # diaspora
8	- #
9	- attr_accessor :path_with_namespace
10	-
11	- # Grit repo object
12	- attr_accessor :repo
13	-
14	- # Default branch in the repository
15	- attr_accessor :root_ref
16	-
17	- def initialize(path_with_namespace, root_ref = 'master')
18	- @root_ref = root_ref \|\| "master"
19	- @path_with_namespace = path_with_namespace
20	-
21	- # Init grit repo object
22	- repo
23	- end
24	-
25	- def raw
26	- repo
27	- end
28	-
29	- def path_to_repo
30	- @path_to_repo \|\|= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
31	- end
32	-
33	- def repo
34	- @repo \|\|= Grit::Repo.new(path_to_repo)
35	- end
36	-
37	- def commit(commit_id = nil)
38	- Commit.find_or_first(repo, commit_id, root_ref)	4	+ def initialize(path_with_namespace, default_branch)
		5	+ @raw_repository = Gitlab::Git::Repository.new(path_with_namespace, default_branch)
		6	+ rescue Gitlab::Git::Repository::NoRepository
		7	+ nil
39	end	8	end
40		9
41	- def fresh_commits(n = 10)
42	- Commit.fresh_commits(repo, n)	10	+ def exists?
		11	+ raw_repository
43	end	12	end
44		13
45	- def commits_with_refs(n = 20)
46	- Commit.commits_with_refs(repo, n)	14	+ def empty?
		15	+ raw_repository.empty?
47	end	16	end
48		17
49	- def commits_since(date)
50	- Commit.commits_since(repo, date)	18	+ def commit(id = nil)
		19	+ commit = raw_repository.commit(id)
		20	+ commit = Commit.new(commit) if commit
		21	+ commit
51	end	22	end
52		23
53	def commits(ref, path = nil, limit = nil, offset = nil)	24	def commits(ref, path = nil, limit = nil, offset = nil)
54	- Commit.commits(repo, ref, path, limit, offset)
55	- end
56	-
57	- def last_commit_for(ref, path = nil)
58	- commits(ref, path, 1).first
59	- end
60	-
61	- def commits_between(from, to)
62	- Commit.commits_between(repo, from, to)	25	+ commits = raw_repository.commits(ref, path, limit, offset)
		26	+ commits = Commit.decorate(commits) if commits.present?
		27	+ commits
63	end	28	end
64		29
65	- # Returns an Array of branch names
66	- # sorted by name ASC
67	- def branch_names
68	- branches.map(&:name)	30	+ def commits_between(target, source)
		31	+ commits = raw_repository.commits_between(target, source)
		32	+ commits = Commit.decorate(commits) if commits.present?
		33	+ commits
69	end	34	end
70		35
71	- # Returns an Array of Branches
72	- def branches
73	- repo.branches.sort_by(&:name)	36	+ def method_missing(m, *args, &block)
		37	+ raw_repository.send(m, *args, &block)
74	end	38	end
75		39
76	- # Returns an Array of tag names
77	- def tag_names
78	- repo.tags.collect(&:name).sort.reverse
79	- end
80	-
81	- # Returns an Array of Tags
82	- def tags
83	- repo.tags.sort_by(&:name).reverse
84	- end
85	-
86	- # Returns an Array of branch and tag names
87	- def ref_names
88	- [branch_names + tag_names].flatten
89	- end
90	-
91	- def heads
92	- @heads \|\|= repo.heads
93	- end
94	-
95	- def tree(fcommit, path = nil)
96	- fcommit = commit if fcommit == :head
97	- tree = fcommit.tree
98	- path ? (tree / path) : tree
99	- end
100	-
101	- def has_commits?
102	- !!commit
103	- rescue Grit::NoSuchPathError
104	- false
105	- end
106	-
107	- def empty?
108	- !has_commits?
109	- end
110	-
111	- # Discovers the default branch based on the repository's available branches
112	- #
113	- # - If no branches are present, returns nil
114	- # - If one branch is present, returns its name
115	- # - If two or more branches are present, returns the one that has a name
116	- # matching root_ref (default_branch or 'master' if default_branch is nil)
117	- def discover_default_branch
118	- if branch_names.length == 0
119	- nil
120	- elsif branch_names.length == 1
121	- branch_names.first
122	- else
123	- branch_names.select { \|v\| v == root_ref }.first
124	- end
125	- end
126	-
127	- # Archive Project to .tar.gz
128	- #
129	- # Already packed repo archives stored at
130	- # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
131	- #
132	- def archive_repo(ref)
133	- ref = ref \|\| self.root_ref
134	- commit = self.commit(ref)
135	- return nil unless commit
136	-
137	- # Build file path
138	- file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
139	- storage_path = Rails.root.join("tmp", "repositories")
140	- file_path = File.join(storage_path, self.path_with_namespace, file_name)
141	-
142	- # Put files into a directory before archiving
143	- prefix = File.basename(self.path_with_namespace) + "/"
144	-
145	- # Create file if not exists
146	- unless File.exists?(file_path)
147	- FileUtils.mkdir_p File.dirname(file_path)
148	- file = self.repo.archive_to_file(ref, prefix, file_path)
149	- end
150	-
151	- file_path
152	- end
153	-
154	- # Return repo size in megabytes
155	- # Cached in redis
156	- def size
157	- Rails.cache.fetch(cache_key(:size)) do
158	- size = popen('du -s', path_to_repo).first.strip.to_i
159	- (size.to_f / 1024).round(2)
160	- end
161	- end
162	-
163	- def expire_cache
164	- Rails.cache.delete(cache_key(:size))
165	- end	40	+ def respond_to?(method)
		41	+ return true if raw_repository.respond_to?(method)
166		42
167	- def cache_key(type)
168	- "#{type}:#{path_with_namespace}"	43	+ super
169	end	44	end
170	end	45	end