store commits for MR as array of hashes

Dmitriy Zaporozhets
1 parent 7af16bbb
Showing 8 changed files with 113 additions and 66 deletions Show diff stats
app/controllers/refs_controller.rb
app/models/merge_request.rb
app/models/tree.rb
app/services/git_push_service.rb
app/views/commits/_diffs.html.haml
lib/extracts_path.rb
lib/gitlab/git/commit.rb
lib/gitlab/git/tree.rb
@@ -48,7 +48,7 @@ class RefsController &lt; ProjectResourceController
     @repo = project.repository
     @commit = @repo.commit(@ref)
-    @tree = Tree.new(@commit.tree, @ref, params[:path])
+    @tree = Tree.new(@repo, @commit.id, @ref, params[:path])
     @hex_path = Digest::SHA1.hexdigest(params[:path] || "")
     if params[:path]
@@ -152,17 +152,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def 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
+    load_commits(st_commits) || []
   end
   def probably_merged?
@@ -172,13 +162,7 @@ class MergeRequest &lt; ActiveRecord::Base
   def reloaded_commits
     if opened? && unmerged_commits.any?
-      # we need to reset st_commits field first
-      # in order to prevent internal rails comparison
-      self.st_commits = []
-      save
-
-      # Then we can safely write unmerged commits
-      self.st_commits = unmerged_commits
+      self.st_commits = dump_commits(unmerged_commits)
       save
     end
     commits
@@ -228,4 +212,14 @@ class MergeRequest &lt; ActiveRecord::Base
   def last_commit_short_sha
     @last_commit_short_sha ||= last_commit.sha[0..10]
   end
+
+  private
+
+  def dump_commits(commits)
+    commits.map(&:to_hash)
+  end
+
+  def load_commits(array)
+    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
+  end
 end
 class Tree
-  include Linguist::BlobHelper
-
   attr_accessor :path, :tree, :ref
-  delegate  :contents, :basename, :name, :data, :mime_type,
-            :mode, :size, :text?, :colorize, to: :tree
-
-  def initialize(raw_tree, ref = nil, path = nil)
-    @ref, @path = ref, path
-    @tree = if path.present?
-              raw_tree / path
-            else
-              raw_tree
-            end
-  end
-
-  def is_blob?
-    tree.is_a?(Grit::Blob)
+  def initialize(repository, sha, ref = nil, path = nil)
+    @raw = Gitlab::Git::Tree.new(repository, sha, ref, path)
   end
   def invalid?
-    tree.nil?
+    @raw.nil?
   end
-  def empty?
-    data.blank?
+  def method_missing(m, *args, &block)
+    @raw.send(m, *args, &block)
   end
-  def up_dir?
-    path.present?
-  end
+  def respond_to?(method)
+    return true if @raw.respond_to?(method)
-  def readme
-    @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+    super
   end
 end
@@ -104,7 +104,7 @@ class GitPushService
       data[:commits] << {
         id: commit.id,
         message: commit.safe_message,
-        timestamp: commit.date.xmlschema,
+        timestamp: commit.committed_date.xmlschema,
         url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",
         author: {
           name: commit.author_name,
@@ -16,7 +16,7 @@
   - unless @suppress_diff
     - diffs.each_with_index do |diff, i|
       - next if diff.diff.empty?
-      - file = (@commit.tree / diff.new_path)
+      - file = Tree.new(@repository, @commit.id, @ref, diff.new_path)
       - file = (@commit.prev_commit.tree / diff.old_path) unless file
       - next unless file
       .file{id: "diff-#{i}"}
@@ -102,7 +102,7 @@ module ExtractsPath
     # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
     @commit = @project.repository.commits(@ref, @path, 1, 0).first
-    @tree = Tree.new(@commit.tree, @ref, @path)
+    @tree = Tree.new(@project.repository, @commit.id, @ref, @path)
     raise InvalidPathError if @tree.invalid?
   rescue RuntimeError, NoMethodError, InvalidPathError
@@ -4,13 +4,19 @@
 module Gitlab
   module Git
     class Commit
-      attr_accessor :raw_commit, :head, :refs
+      attr_accessor :raw_commit, :head, :refs,
+        :sha, :authored_date, :committed_date, :message,
+        :author_name, :author_email,
+        :committer_name, :committer_email
-      delegate  :message, :authored_date, :committed_date, :parents, :sha,
-        :date, :committer, :author, :diffs, :tree, :id, :stats, :to_patch,
+      delegate :parents, :diffs, :tree, :stats, :to_patch,
         to: :raw_commit
       class << self
+        def serialize_keys
+          %w(sha authored_date committed_date author_name author_email committer_name committer_email message)
+        end
+
         def find_or_first(repo, commit_id = nil, root_ref)
           commit = if commit_id
                      repo.commit(commit_id)
@@ -73,10 +79,19 @@ module Gitlab
       def initialize(raw_commit, head = nil)
         raise "Nil as raw commit passed" unless raw_commit
-        @raw_commit = raw_commit
+        if raw_commit.is_a?(Hash)
+          init_from_hash(raw_commit)
+        else
+          init_from_grit(raw_commit)
+        end
+
         @head = head
       end
+      def id
+        sha
+      end
+
       def short_id(length = 10)
         id.to_s[0..length]
       end
@@ -89,27 +104,11 @@ module Gitlab
         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)
@@ -148,6 +147,38 @@ module Gitlab
       def no_commit_message
         "--no commit message"
       end
+
+      def to_hash
+        hash = {}
+
+        keys = Commit.serialize_keys
+
+        keys.each do |key|
+          hash[key] = send(key)
+        end
+
+        hash
+      end
+
+      private
+
+      def init_from_grit(grit)
+        @raw_commit = grit
+        @sha = grit.sha
+        @message = grit.message
+        @authored_date = grit.authored_date
+        @committed_date = grit.committed_date
+        @author_name = grit.author.name
+        @author_email = grit.author.email
+        @committer_name = grit.committer.name
+        @committer_email = grit.committer.email
+      end
+
+      def init_from_hash(hash)
+        Commit.serialize_keys.each do |key|
+          send(:"#{key}=", hash[key])
+        end
+      end
     end
   end
 end
@@ -0,0 +1,38 @@
+module Gitlab
+  module Git
+    class Tree
+      include Linguist::BlobHelper
+
+      attr_accessor :repository, :sha, :path, :ref, :raw_tree
+
+      def initialize(repository, sha, ref = nil, path = nil)
+        @repository, @sha, @ref = repository, sha, ref
+
+        # Load tree from repository
+        @commit = @repository.commit(sha)
+        @raw_tree = @repository.tree(@commit, path)
+      end
+
+      def empty?
+        data.blank?
+      end
+
+      def data
+        raw_tree.data
+      end
+
+      def is_blob?
+        tree.is_a?(Grit::Blob)
+      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
+  end
+end
+
	@@ -48,7 +48,7 @@ class RefsController < ProjectResourceController		@@ -48,7 +48,7 @@ class RefsController < ProjectResourceController
48		48
49	@repo = project.repository	49	@repo = project.repository
50	@commit = @repo.commit(@ref)	50	@commit = @repo.commit(@ref)
51	- @tree = Tree.new(@commit.tree, @ref, params[:path])	51	+ @tree = Tree.new(@repo, @commit.id, @ref, params[:path])
52	@hex_path = Digest::SHA1.hexdigest(params[:path] \|\| "")	52	@hex_path = Digest::SHA1.hexdigest(params[:path] \|\| "")
53		53
54	if params[:path]	54	if params[:path]
	@@ -104,7 +104,7 @@ class GitPushService		@@ -104,7 +104,7 @@ class GitPushService
104	data[:commits] << {	104	data[:commits] << {
105	id: commit.id,	105	id: commit.id,
106	message: commit.safe_message,	106	message: commit.safe_message,
107	- timestamp: commit.date.xmlschema,	107	+ timestamp: commit.committed_date.xmlschema,
108	url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",	108	url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",
109	author: {	109	author: {
110	name: commit.author_name,	110	name: commit.author_name,
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	- unless @suppress_diff	16	- unless @suppress_diff
17	- diffs.each_with_index do \|diff, i\|	17	- diffs.each_with_index do \|diff, i\|
18	- next if diff.diff.empty?	18	- next if diff.diff.empty?
19	- - file = (@commit.tree / diff.new_path)	19	+ - file = Tree.new(@repository, @commit.id, @ref, diff.new_path)
20	- file = (@commit.prev_commit.tree / diff.old_path) unless file	20	- file = (@commit.prev_commit.tree / diff.old_path) unless file
21	- next unless file	21	- next unless file
22	.file{id: "diff-#{i}"}	22	.file{id: "diff-#{i}"}
	@@ -102,7 +102,7 @@ module ExtractsPath		@@ -102,7 +102,7 @@ module ExtractsPath
102	# because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.	102	# because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
103	@commit = @project.repository.commits(@ref, @path, 1, 0).first	103	@commit = @project.repository.commits(@ref, @path, 1, 0).first
104		104
105	- @tree = Tree.new(@commit.tree, @ref, @path)	105	+ @tree = Tree.new(@project.repository, @commit.id, @ref, @path)
106		106
107	raise InvalidPathError if @tree.invalid?	107	raise InvalidPathError if @tree.invalid?
108	rescue RuntimeError, NoMethodError, InvalidPathError	108	rescue RuntimeError, NoMethodError, InvalidPathError
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+module Gitlab
	2	+ module Git
	3	+ class Tree
	4	+ include Linguist::BlobHelper
	5	+
	6	+ attr_accessor :repository, :sha, :path, :ref, :raw_tree
	7	+
	8	+ def initialize(repository, sha, ref = nil, path = nil)
	9	+ @repository, @sha, @ref = repository, sha, ref
	10	+
	11	+ # Load tree from repository
	12	+ @commit = @repository.commit(sha)
	13	+ @raw_tree = @repository.tree(@commit, path)
	14	+ end
	15	+
	16	+ def empty?
	17	+ data.blank?
	18	+ end
	19	+
	20	+ def data
	21	+ raw_tree.data
	22	+ end
	23	+
	24	+ def is_blob?
	25	+ tree.is_a?(Grit::Blob)
	26	+ end
	27	+
	28	+ def up_dir?
	29	+ path.present?
	30	+ end
	31	+
	32	+ def readme
	33	+ @readme \|\|= contents.find { \|c\| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
	34	+ end
	35	+ end
	36	+ end
	37	+end
	38	+