merge_request_diff.rb 3.92 KB
Newer Older
1
class MergeRequestDiff < ActiveRecord::Base
2 3
  include Sortable

4
  # Prevent store of diff if commits amount more then 500
5
  COMMITS_SAFE_SIZE = 100
6 7 8 9 10 11 12

  belongs_to :merge_request

  delegate :target_branch, :source_branch, to: :merge_request, prefix: nil

  state_machine :state, initial: :empty do
    state :collected
13 14 15
    state :overflow
    # Deprecated states: these are no longer used but these values may still occur
    # in the database.
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
    state :timeout
    state :overflow_commits_safe_size
    state :overflow_diff_files_limit
    state :overflow_diff_lines_limit
  end

  serialize :st_commits
  serialize :st_diffs

  after_create :reload_content

  def reload_content
    reload_commits
    reload_diffs
  end

32 33
  def size
    real_size.presence || diffs.size
34 35
  end

36 37 38 39 40 41 42 43 44 45 46 47 48
  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
49 50
  end

51 52 53 54 55 56 57 58
  def commits
    @commits ||= load_commits(st_commits || [])
  end

  def last_commit
    commits.first
  end

59 60 61 62
  def first_commit
    commits.last
  end

63 64 65 66 67 68
  def base_commit
    return nil unless self.base_commit_sha

    merge_request.target_project.commit(self.base_commit_sha)
  end

69
  def last_commit_short_sha
70
    @last_commit_short_sha ||= last_commit.short_id
71 72 73 74 75 76 77
  end

  def dump_commits(commits)
    commits.map(&:to_hash)
  end

  def load_commits(array)
78
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash), merge_request.source_project) }
79 80 81 82 83 84 85 86
  end

  def dump_diffs(diffs)
    if diffs.respond_to?(:map)
      diffs.map(&:to_hash)
    end
  end

87 88 89 90 91
  def load_diffs(raw, options)
    if raw.respond_to?(:each)
      Gitlab::Git::DiffCollection.new(raw, options)
    else
      Gitlab::Git::DiffCollection.new([])
92 93 94 95 96 97
    end
  end

  # Collect array of Git::Commit objects
  # between target and source branches
  def unmerged_commits
98
    commits = compare.commits
99 100

    if commits.present?
101
      commits = Commit.decorate(commits, merge_request.source_project).
102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
        sort_by(&:created_at).
        reverse
    end

    commits
  end

  # Reload all commits related to current merge request from repo
  # and save it as array of hashes in st_commits db field
  def reload_commits
    commit_objects = unmerged_commits

    if commit_objects.present?
      self.st_commits = dump_commits(commit_objects)
    end

    save
  end

  # Reload diffs between branches related to current merge request from repo
  # and save it as array of hashes in st_diffs db field
  def reload_diffs
    new_diffs = []

    if commits.size.zero?
      self.state = :empty
    else
129
      diff_collection = unmerged_diffs
130

131 132 133 134
      if diff_collection.overflow?
        # Set our state to 'overflow' to make the #empty? and #collected?
        # methods (generated by StateMachine) return false.
        self.state = :overflow
135 136
      end

137
      self.real_size = diff_collection.real_size
138

139 140 141 142
      if diff_collection.any?
        new_diffs = dump_diffs(diff_collection)
        self.state = :collected
      end
143
    end
144 145

    self.st_diffs = new_diffs
146

147
    self.base_commit_sha = self.repository.merge_base(self.source_sha, self.target_branch)
148

149 150 151 152 153 154
    self.save
  end

  # Collect array of Git::Diff objects
  # between target and source branches
  def unmerged_diffs
155
    compare.diffs(Commit.max_diff_options)
156 157 158 159 160
  end

  def repository
    merge_request.target_project.repository
  end
161

162 163 164 165
  def source_sha
    source_commit = merge_request.source_project.commit(source_branch)
    source_commit.try(:sha)
  end
166

167 168
  def compare
    @compare ||=
169 170 171 172
      begin
        # Update ref for merge request
        merge_request.fetch_ref

173 174 175 176
        Gitlab::Git::Compare.new(
          self.repository.raw_repository,
          self.target_branch,
          self.source_sha
177 178
        )
      end
179
  end
180
end