merge_request_diff.rb 5.35 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 :head_source_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 28 29 30 31 32

  def reload_content
    reload_commits
    reload_diffs
  end

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

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

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

  def last_commit
    commits.first
  end

60 61 62 63
  def first_commit
    commits.last
  end

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

    merge_request.target_project.commit(self.base_commit_sha)
  end

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

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

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

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

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

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

    if commits.present?
Sean McGivern's avatar
Sean McGivern committed
102
      commits = Commit.decorate(commits, merge_request.source_project).reverse
103 104 105 106 107 108 109 110
    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
111 112
    new_attributes = {}

113 114 115
    commit_objects = unmerged_commits

    if commit_objects.present?
116
      new_attributes[:st_commits] = dump_commits(commit_objects)
117 118
    end

119
    update_columns_serialized(new_attributes)
120 121 122 123 124
  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
125
    new_attributes = {}
126 127 128
    new_diffs = []

    if commits.size.zero?
129
      new_attributes[:state] = :empty
130
    else
131
      diff_collection = unmerged_diffs
132

133 134 135
      if diff_collection.overflow?
        # Set our state to 'overflow' to make the #empty? and #collected?
        # methods (generated by StateMachine) return false.
136
        new_attributes[:state] = :overflow
137 138
      end

139
      new_attributes[:real_size] = diff_collection.real_size
140

141 142
      if diff_collection.any?
        new_diffs = dump_diffs(diff_collection)
143
        new_attributes[:state] = :collected
144
      end
145
    end
146

147 148
    new_attributes[:st_diffs] = new_diffs
    new_attributes[:base_commit_sha] = self.repository.merge_base(self.head, self.base)
149

150
    update_columns_serialized(new_attributes)
151 152 153 154 155
  end

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

  def repository
    merge_request.target_project.repository
  end
162

163
  def source_sha
164 165
    return head_source_sha if head_source_sha.present?

166 167 168
    source_commit = merge_request.source_project.commit(source_branch)
    source_commit.try(:sha)
  end
169

170 171 172 173 174 175 176 177 178 179 180 181
  def target_sha
    merge_request.target_sha
  end

  def base
    self.target_sha || self.target_branch
  end

  def head
    self.source_sha
  end

182 183
  def compare
    @compare ||=
184 185 186 187
      begin
        # Update ref for merge request
        merge_request.fetch_ref

188 189
        Gitlab::Git::Compare.new(
          self.repository.raw_repository,
190 191
          self.base,
          self.head
192 193
        )
      end
194
  end
195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219

  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
220
end