merge_request_diff.rb 4.09 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 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
    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
128
      diff_collection = unmerged_diffs
129

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

136
      self.real_size = diff_collection.real_size
137

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

    self.st_diffs = new_diffs
145

146
    self.base_commit_sha = self.repository.merge_base(self.head, self.base)
147

148 149 150 151 152 153
    self.save
  end

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

  def repository
    merge_request.target_project.repository
  end
160

161
  def source_sha
162 163
    return head_source_sha if head_source_sha.present?

164 165 166
    source_commit = merge_request.source_project.commit(source_branch)
    source_commit.try(:sha)
  end
167

168 169 170 171 172 173 174 175 176 177 178 179
  def target_sha
    merge_request.target_sha
  end

  def base
    self.target_sha || self.target_branch
  end

  def head
    self.source_sha
  end

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

186 187
        Gitlab::Git::Compare.new(
          self.repository.raw_repository,
188 189
          self.base,
          self.head
190 191
        )
      end
192
  end
193
end