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

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

  belongs_to :merge_request

10
  delegate :source_branch_sha, :target_branch_sha, :target_branch, :source_branch, to: :merge_request, prefix: nil
11 12 13

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

  serialize :st_commits
  serialize :st_diffs

26
  after_create :reload_content, unless: :importing?
27
  after_save :keep_around_commits
28 29 30 31 32 33

  def reload_content
    reload_commits
    reload_diffs
  end

34 35
  def size
    real_size.presence || diffs.size
36 37
  end

38 39 40 41 42
  def diffs(options={})
    if options[:ignore_whitespace_change]
      @diffs_no_whitespace ||= begin
        compare = Gitlab::Git::Compare.new(
          self.repository.raw_repository,
43 44
          self.target_branch_sha,
          self.source_branch_sha,
45 46 47 48 49 50
        )
        compare.diffs(options)
      end
    else
      @diffs ||= load_diffs(st_diffs, options)
    end
51 52
  end

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

  def last_commit
    commits.first
  end

61 62 63 64
  def first_commit
    commits.last
  end

65
  def base_commit
66
    return unless self.base_commit_sha
67 68 69 70

    merge_request.target_project.commit(self.base_commit_sha)
  end

71 72 73 74 75 76 77 78 79 80
  def start_commit
    return unless self.start_commit_sha

    merge_request.target_project.commit(self.start_commit_sha)
  end

  def head_commit
    return last_commit unless self.head_commit_sha

    merge_request.target_project.commit(self.head_commit_sha)
81 82 83 84 85 86 87
  end

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

  def load_commits(array)
88
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash), merge_request.source_project) }
89 90 91 92 93 94 95 96
  end

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

97 98 99 100 101
  def load_diffs(raw, options)
    if raw.respond_to?(:each)
      Gitlab::Git::DiffCollection.new(raw, options)
    else
      Gitlab::Git::DiffCollection.new([])
102 103 104 105 106 107
    end
  end

  # Collect array of Git::Commit objects
  # between target and source branches
  def unmerged_commits
108
    commits = compare.commits
109 110

    if commits.present?
Sean McGivern's avatar
Sean McGivern committed
111
      commits = Commit.decorate(commits, merge_request.source_project).reverse
112 113 114 115 116 117 118 119
    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
120 121
    new_attributes = {}

122 123 124
    commit_objects = unmerged_commits

    if commit_objects.present?
125
      new_attributes[:st_commits] = dump_commits(commit_objects)
126 127
    end

128
    update_columns_serialized(new_attributes)
129 130 131 132 133
  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
134
    new_attributes = {}
135 136 137
    new_diffs = []

    if commits.size.zero?
138
      new_attributes[:state] = :empty
139
    else
140
      diff_collection = unmerged_diffs
141

142 143 144
      if diff_collection.overflow?
        # Set our state to 'overflow' to make the #empty? and #collected?
        # methods (generated by StateMachine) return false.
145
        new_attributes[:state] = :overflow
146 147
      end

148
      new_attributes[:real_size] = diff_collection.real_size
149

150 151
      if diff_collection.any?
        new_diffs = dump_diffs(diff_collection)
152
        new_attributes[:state] = :collected
153
      end
154
    end
155

156
    new_attributes[:st_diffs] = new_diffs
157

158 159 160
    new_attributes[:start_commit_sha] = self.target_branch_sha
    new_attributes[:head_commit_sha] = self.source_branch_sha
    new_attributes[:base_commit_sha] = branch_base_sha
161

162
    update_columns_serialized(new_attributes)
163 164

    keep_around_commits
165 166 167 168 169
  end

  # Collect array of Git::Diff objects
  # between target and source branches
  def unmerged_diffs
170
    compare.diffs(Commit.max_diff_options)
171 172 173 174 175
  end

  def repository
    merge_request.target_project.repository
  end
176

177 178
  def branch_base_commit
    return unless self.source_branch_sha && self.target_branch_sha
179

180
    merge_request.target_project.merge_base_commit(self.source_branch_sha, self.target_branch_sha)
181 182
  end

183 184
  def branch_base_sha
    branch_base_commit.try(:sha)
185 186
  end

187 188
  def compare
    @compare ||=
189 190 191 192
      begin
        # Update ref for merge request
        merge_request.fetch_ref

193 194
        Gitlab::Git::Compare.new(
          self.repository.raw_repository,
195 196
          self.target_branch_sha,
          self.source_branch_sha
197 198
        )
      end
199
  end
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224

  private

  #
  # #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
225

226 227 228 229
  def keep_around_commits
    self.repository.keep_around(target_branch_sha)
    self.repository.keep_around(source_branch_sha)
    self.repository.keep_around(branch_base_sha)
230
  end
231
end