merge_request_diff.rb 8.65 KB
Newer Older
1
class MergeRequestDiff < ActiveRecord::Base
2
  include Sortable
3
  include Importable
Robert Speicher's avatar
Robert Speicher committed
4
  include Gitlab::Git::EncodingHelper
5

6
  # Prevent store of diff if commits amount more then 500
7
  COMMITS_SAFE_SIZE = 100
8

9
  # Valid types of serialized diffs allowed by Gitlab::Git::Diff
Douwe Maan's avatar
Douwe Maan committed
10
  VALID_CLASSES = [Hash, Rugged::Patch, Rugged::Diff::Delta].freeze
11

12 13
  belongs_to :merge_request

14 15 16
  serialize :st_commits
  serialize :st_diffs

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

28
  scope :viewable, -> { without_state(:empty) }
29

30 31
  # All diff information is collected from repository after object is created.
  # It allows you to override variables like head_commit_sha before getting diff.
32
  after_create :save_git_content, unless: :importing?
33

Douwe Maan's avatar
Douwe Maan committed
34
  def self.find_by_diff_refs(diff_refs)
Douwe Maan's avatar
Douwe Maan committed
35
    find_by(start_commit_sha: diff_refs.start_sha, head_commit_sha: diff_refs.head_sha, base_commit_sha: diff_refs.base_sha)
Douwe Maan's avatar
Douwe Maan committed
36 37
  end

38 39 40 41
  def self.select_without_diff
    select(column_names - ['st_diffs'])
  end

42 43 44 45
  def st_commits
    super || []
  end

46 47 48
  # Collect information about commits and diff from repository
  # and save it to the database as serialized data
  def save_git_content
49
    ensure_commits_sha
50
    save_commits
51
    reload_commits
52
    save_diffs
53 54 55 56
    keep_around_commits
  end

  def ensure_commits_sha
57
    merge_request.fetch_ref
58
    self.start_commit_sha ||= merge_request.target_branch_sha
59
    self.head_commit_sha  ||= merge_request.source_branch_sha
60
    self.base_commit_sha  ||= find_base_sha
61 62 63 64 65 66 67 68 69 70 71
    save
  end

  # Override head_commit_sha to keep compatibility with merge request diff
  # created before version 8.4 that does not store head_commit_sha in separate db field.
  def head_commit_sha
    if persisted? && super.nil?
      last_commit.try(:sha)
    else
      super
    end
72 73
  end

74 75 76 77 78 79 80
  # This method will rely on repository branch sha
  # in case start_commit_sha is nil. Its necesarry for old merge request diff
  # created before version 8.4 to work
  def safe_start_commit_sha
    start_commit_sha || merge_request.target_branch_sha
  end

81
  def size
82
    real_size.presence || raw_diffs.size
83 84
  end

85
  def raw_diffs(options = {})
86
    if options[:ignore_whitespace_change]
87
      @diffs_no_whitespace ||=
88 89 90
        Gitlab::Git::Compare.new(
          repository.raw_repository,
          safe_start_commit_sha,
91
          head_commit_sha).diffs(options)
92
    else
93 94
      @raw_diffs ||= {}
      @raw_diffs[options] ||= load_diffs(st_diffs, options)
95
    end
96 97
  end

98
  def commits
99
    @commits ||= load_commits(st_commits)
100 101
  end

102 103 104 105 106
  def reload_commits
    @commits = nil
    commits
  end

107 108 109 110
  def last_commit
    commits.first
  end

111 112 113 114
  def first_commit
    commits.last
  end

115
  def base_commit
116
    return unless base_commit_sha
117

118
    project.commit(base_commit_sha)
119 120
  end

121
  def start_commit
122
    return unless start_commit_sha
123

124
    project.commit(start_commit_sha)
125 126 127
  end

  def head_commit
128
    return unless head_commit_sha
129

130
    project.commit(head_commit_sha)
131 132
  end

133
  def commits_sha
134
    st_commits.map { |commit| commit[:id] }
135 136
  end

Douwe Maan's avatar
Douwe Maan committed
137 138 139 140 141 142 143 144 145 146 147 148
  def diff_refs=(new_diff_refs)
    if new_diff_refs
      self.base_commit_sha = new_diff_refs.base_sha
      self.start_commit_sha = new_diff_refs.start_sha
      self.head_commit_sha = new_diff_refs.head_sha
    else
      self.base_commit_sha = nil
      self.start_commit_sha = nil
      self.head_commit_sha = nil
    end
  end

149
  def diff_refs
150
    return unless start_commit_sha || base_commit_sha
151 152 153 154 155 156 157 158

    Gitlab::Diff::DiffRefs.new(
      base_sha:  base_commit_sha,
      start_sha: start_commit_sha,
      head_sha:  head_commit_sha
    )
  end

159 160 161 162
  def diff_refs_by_sha?
    base_commit_sha? && head_commit_sha? && start_commit_sha?
  end

163 164 165 166 167 168 169
  def diffs(diff_options = nil)
    Gitlab::Diff::FileCollection::MergeRequestDiff.new(self, diff_options: diff_options)
  end

  def project
    merge_request.target_project
  end
170

171 172
  def compare
    @compare ||=
173 174 175 176 177
      Gitlab::Git::Compare.new(
        repository.raw_repository,
        safe_start_commit_sha,
        head_commit_sha
      )
178 179
  end

180 181 182 183
  def latest?
    self == merge_request.merge_request_diff
  end

184
  def compare_with(sha, straight: true)
185
    # When compare merge request versions we want diff A..B instead of A...B
186
    # so we handle cases when user does squash and rebase of the commits between versions.
187
    # For this reason we set straight to true by default.
Douwe Maan's avatar
Douwe Maan committed
188 189
    CompareService.new(project, head_commit_sha)
      .execute(project, sha, straight: straight)
190 191
  end

192 193 194 195
  def commits_count
    st_commits.count
  end

196 197 198 199 200 201 202 203 204 205
  def utf8_st_diffs
    return [] if st_diffs.blank?

    st_diffs.map do |diff|
      diff.each do |k, v|
        diff[k] = encode_utf8(v) if v.respond_to?(:encoding)
      end
    end
  end

206 207
  private

208 209 210 211 212 213 214 215 216
  # Old GitLab implementations may have generated diffs as ["--broken-diff"].
  # Avoid an error 500 by ignoring bad elements. See:
  # https://gitlab.com/gitlab-org/gitlab-ce/issues/20776
  def valid_raw_diff?(raw)
    return false unless raw.respond_to?(:each)

    raw.any? { |element| VALID_CLASSES.include?(element.class) }
  end

217 218 219 220 221 222 223 224
  def dump_commits(commits)
    commits.map(&:to_hash)
  end

  def load_commits(array)
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash), merge_request.source_project) }
  end

225
  # Load all commits related to current merge request diff from repo
226
  # and save it as array of hashes in st_commits db field
227
  def save_commits
228 229
    new_attributes = {}

230
    commits = compare.commits
231

232 233 234
    if commits.present?
      commits = Commit.decorate(commits, merge_request.source_project).reverse
      new_attributes[:st_commits] = dump_commits(commits)
235 236
    end

237
    update_columns_serialized(new_attributes)
238 239
  end

240 241 242 243 244 245 246
  def dump_diffs(diffs)
    if diffs.respond_to?(:map)
      diffs.map(&:to_hash)
    end
  end

  def load_diffs(raw, options)
247
    if valid_raw_diff?(raw)
248
      if paths = options[:paths]
249
        raw = raw.select do |diff|
250
          paths.include?(diff[:old_path]) || paths.include?(diff[:new_path])
251 252 253
        end
      end

254 255 256 257 258 259
      Gitlab::Git::DiffCollection.new(raw, options)
    else
      Gitlab::Git::DiffCollection.new([])
    end
  end

260
  # Load diffs between branches related to current merge request diff from repo
261
  # and save it as array of hashes in st_diffs db field
262
  def save_diffs
263
    new_attributes = {}
264 265

    if commits.size.zero?
266
      new_attributes[:state] = :empty
267
    else
268
      diff_collection = compare.diffs(Commit.max_diff_options)
269
      new_attributes[:real_size] = compare.diffs.real_size
270

271 272
      if diff_collection.any?
        new_diffs = dump_diffs(diff_collection)
273
        new_attributes[:state] = :collected
274
      end
275 276 277 278 279 280 281 282 283

      new_attributes[:st_diffs] = new_diffs || []

      # Set our state to 'overflow' to make the #empty? and #collected?
      # methods (generated by StateMachine) return false.
      #
      # This attribution has to come at the end of the method so 'overflow'
      # state does not get overridden by 'collected'.
      new_attributes[:state] = :overflow if diff_collection.overflow?
284
    end
285

286
    update_columns_serialized(new_attributes)
287 288 289
  end

  def repository
290
    project.repository
291
  end
292

293 294
  def find_base_sha
    return unless head_commit_sha && start_commit_sha
295

296
    project.merge_base_commit(head_commit_sha, start_commit_sha).try(:sha)
297 298
  end

299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320
  #
  # #save or #update_attributes providing changes on serialized attributes do a lot of
  # serialization and deserialization calls resulting in bad performance.
  # Using #update_columns solves the problem with just one YAML.dump per serialized attribute that we provide.
  # As a tradeoff we need to reload the current instance to properly manage time objects on those serialized
  # attributes. So to keep the same behaviour as the attribute assignment we reload the instance.
  # The difference is in the usage of
  # #write_attribute= (#update_attributes) and #raw_write_attribute= (#update_columns)
  #
  # Ex:
  #
  #   new_attributes[:st_commits].first.slice(:committed_date)
  #   => {:committed_date=>2014-02-27 11:01:38 +0200}
  #   YAML.load(YAML.dump(new_attributes[:st_commits].first.slice(:committed_date)))
  #   => {:committed_date=>2014-02-27 10:01:38 +0100}
  #
  def update_columns_serialized(new_attributes)
    return unless new_attributes.any?

    update_columns(new_attributes.merge(updated_at: current_time_from_proper_timezone))
    reload
  end
321

322
  def keep_around_commits
323 324 325 326 327
    [repository, merge_request.source_project.repository].each do |repo|
      repo.keep_around(start_commit_sha)
      repo.keep_around(head_commit_sha)
      repo.keep_around(base_commit_sha)
    end
328
  end
329
end