1 files changed, 42 insertions, 46 deletions

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index c95179d6046..33884118595 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -17,9 +17,7 @@ class MergeRequestDiff < ActiveRecord::Base
   include Sortable
 
   # Prevent store of diff if commits amount more then 500
-  COMMITS_SAFE_SIZE = 500
-
-  attr_reader :commits, :diffs, :diffs_no_whitespace
+  COMMITS_SAFE_SIZE = 100
 
   belongs_to :merge_request
 
@@ -27,6 +25,9 @@ class MergeRequestDiff < ActiveRecord::Base
 
   state_machine :state, initial: :empty do
     state :collected
+    state :overflow
+    # Deprecated states: these are no longer used but these values may still occur
+    # in the database.
     state :timeout
     state :overflow_commits_safe_size
     state :overflow_diff_files_limit
@@ -43,19 +44,23 @@ class MergeRequestDiff < ActiveRecord::Base
     reload_diffs
   end
 
-  def diffs
-    @diffs ||= (load_diffs(st_diffs) || [])
+  def size
+    real_size.presence || diffs.size
   end
 
-  def diffs_no_whitespace
-    compare_result = Gitlab::CompareResult.new(
-      Gitlab::Git::Compare.new(
-        self.repository.raw_repository,
-        self.target_branch,
-        self.source_sha,
-      ), { ignore_whitespace_change: true }
-    )
-    @diffs_no_whitespace ||= load_diffs(dump_commits(compare_result.diffs))
+  def diffs(options={})
+    if options[:ignore_whitespace_change]
+      @diffs_no_whitespace ||= begin
+        compare = Gitlab::Git::Compare.new(
+          self.repository.raw_repository,
+          self.target_branch,
+          self.source_sha,
+        )
+        compare.diffs(options)
+      end
+    else
+      @diffs ||= load_diffs(st_diffs, options)
+    end
   end
 
   def commits
@@ -94,16 +99,18 @@ class MergeRequestDiff < ActiveRecord::Base
     end
   end
 
-  def load_diffs(raw)
-    if raw.respond_to?(:map)
-      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
+  def load_diffs(raw, options)
+    if raw.respond_to?(:each)
+      Gitlab::Git::DiffCollection.new(raw, options)
+    else
+      Gitlab::Git::DiffCollection.new([])
     end
   end
 
   # Collect array of Git::Commit objects
   # between target and source branches
   def unmerged_commits
-    commits = compare_result.commits
+    commits = compare.commits
 
     if commits.present?
       commits = Commit.decorate(commits, merge_request.source_project).
@@ -133,27 +140,21 @@ class MergeRequestDiff < ActiveRecord::Base
 
     if commits.size.zero?
       self.state = :empty
-    elsif commits.size > COMMITS_SAFE_SIZE
-      self.state = :overflow_commits_safe_size
     else
-      new_diffs = unmerged_diffs
-    end
+      diff_collection = unmerged_diffs
 
-    if new_diffs.any?
-      if new_diffs.size > Commit::DIFF_HARD_LIMIT_FILES
-        self.state = :overflow_diff_files_limit
-        new_diffs = new_diffs.first(Commit::DIFF_HARD_LIMIT_LINES)
+      if diff_collection.overflow?
+        # Set our state to 'overflow' to make the #empty? and #collected?
+        # methods (generated by StateMachine) return false.
+        self.state = :overflow
       end
 
-      if new_diffs.sum { |diff| diff.diff.lines.count } > Commit::DIFF_HARD_LIMIT_LINES
-        self.state = :overflow_diff_lines_limit
-        new_diffs = new_diffs.first(Commit::DIFF_HARD_LIMIT_LINES)
-      end
-    end
+      self.real_size = diff_collection.real_size
 
-    if new_diffs.present?
-      new_diffs = dump_commits(new_diffs)
-      self.state = :collected
+      if diff_collection.any?
+        new_diffs = dump_diffs(diff_collection)
+        self.state = :collected
+      end
     end
 
     self.st_diffs = new_diffs
@@ -166,10 +167,7 @@ class MergeRequestDiff < ActiveRecord::Base
   # Collect array of Git::Diff objects
   # between target and source branches
   def unmerged_diffs
-    compare_result.diffs || []
-  rescue Gitlab::Git::Diff::TimeoutError
-    self.state = :timeout
-    []
+    compare.diffs(Commit.max_diff_options)
   end
 
   def repository
@@ -181,18 +179,16 @@ class MergeRequestDiff < ActiveRecord::Base
     source_commit.try(:sha)
   end
 
-  def compare_result
-    @compare_result ||=
+  def compare
+    @compare ||=
       begin
         # Update ref for merge request
         merge_request.fetch_ref
 
-        Gitlab::CompareResult.new(
-          Gitlab::Git::Compare.new(
-            self.repository.raw_repository,
-            self.target_branch,
-            self.source_sha
-          )
+        Gitlab::Git::Compare.new(
+          self.repository.raw_repository,
+          self.target_branch,
+          self.source_sha
         )
       end
   end