merge_request.rb 5.39 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
# == Schema Information
#
# Table name: merge_requests
#
#  id            :integer          not null, primary key
#  target_branch :string(255)      not null
#  source_branch :string(255)      not null
#  project_id    :integer          not null
#  author_id     :integer
#  assignee_id   :integer
#  title         :string(255)
#  created_at    :datetime         not null
#  updated_at    :datetime         not null
#  st_commits    :text(2147483647)
#  st_diffs      :text(2147483647)
16
#  milestone_id  :integer
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
17 18 19
#  state         :string(255)
#  merge_status  :string(255)
#
20

21
require Rails.root.join("app/models/commit")
22
require Rails.root.join("lib/static_model")
23

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
24
class MergeRequest < ActiveRecord::Base
25
  include Issuable
26

27
  attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
28
                  :author_id_of_changes, :state_event
29

Andrey Kumanyaev's avatar
Andrey Kumanyaev committed
30 31
  attr_accessor :should_remove_source_branch

Andrew8xx8's avatar
Andrew8xx8 committed
32
  state_machine :state, initial: :opened do
33 34 35 36 37 38 39 40 41
    event :close do
      transition [:reopened, :opened] => :closed
    end

    event :merge do
      transition [:reopened, :opened] => :merged
    end

    event :reopen do
Andrew8xx8's avatar
Andrew8xx8 committed
42
      transition closed: :reopened
43 44 45 46 47 48 49 50 51 52 53
    end

    state :opened

    state :reopened

    state :closed

    state :merged
  end

54 55 56 57 58 59 60 61 62 63 64 65 66
  state_machine :merge_status, initial: :unchecked do
    event :mark_as_unchecked do
      transition [:can_be_merged, :cannot_be_merged] => :unchecked
    end

    event :mark_as_mergeable do
      transition unchecked: :can_be_merged
    end

    event :mark_as_unmergeable do
      transition unchecked: :cannot_be_merged
    end

67
    state :unchecked
68

69 70 71 72
    state :can_be_merged

    state :cannot_be_merged
  end
73

74 75 76
  serialize :st_commits
  serialize :st_diffs

Andrey Kumanyaev's avatar
Andrey Kumanyaev committed
77 78
  validates :source_branch, presence: true
  validates :target_branch, presence: true
79
  validate  :validate_branches
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
80

81
  scope :merged, -> { with_state(:merged) }
82 83
  scope :by_branch, ->(branch_name) { where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name) }
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
84
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
85

86 87 88 89
  # Closed scope for merge request should return
  # both merged and closed mr's
  scope :closed, -> { with_states(:closed, :merged) }

90
  def validate_branches
91
    if target_branch == source_branch
92
      errors.add :branch_conflict, "You can not use same branch for source and target branches"
93 94 95
    end
  end

96 97 98 99 100
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

101
  def check_if_can_be_merged
102 103 104 105 106
    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
107 108
  end

109
  def diffs
110
    load_diffs(st_diffs) || []
111 112 113
  end

  def reloaded_diffs
114
    if opened? && unmerged_diffs.any?
115
      self.st_diffs = dump_diffs(unmerged_diffs)
116
      self.save
117
    end
118 119 120
  end

  def broken_diffs?
121
    diffs == broken_diffs
122 123 124 125
  end

  def valid_diffs?
    !broken_diffs?
126 127 128
  end

  def unmerged_diffs
129
    project.repository.diffs_between(source_branch, target_branch)
130 131 132
  end

  def last_commit
133
    commits.first
134
  end
135

136
  def merge_event
137
    self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
138 139
  end

140
  def closed_event
141
    self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
142 143
  end

144
  def commits
145
    load_commits(st_commits || [])
146 147 148
  end

  def probably_merged?
149
    unmerged_commits.empty? &&
150
      commits.any? && opened?
151 152
  end

153
  def reloaded_commits
154
    if opened? && unmerged_commits.any?
155
      self.st_commits = dump_commits(unmerged_commits)
156 157 158 159 160 161
      save
    end
    commits
  end

  def unmerged_commits
162
    self.project.repository.
163 164 165 166
      commits_between(self.target_branch, self.source_branch).
      sort_by(&:created_at).
      reverse
  end
167 168

  def merge!(user_id)
169
    self.author_id_of_changes = user_id
170
    self.merge
171
  end
172

173
  def automerge!(current_user)
174
    if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
175 176 177
      self.merge!(current_user.id)
      true
    end
Zevs's avatar
Zevs committed
178
  rescue
179
    mark_as_unmergeable
180 181
    false
  end
randx's avatar
randx committed
182

183 184
  def mr_and_commit_notes
    commit_ids = commits.map(&:id)
185
    Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
186
  end
187 188 189 190 191 192 193 194 195 196 197 198 199 200

  # Returns the raw diff for this merge request
  #
  # see "git diff"
  def to_diff
    project.repo.git.native(:diff, {timeout: 30, raise: true}, "#{target_branch}...#{source_branch}")
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
  def to_patch
    project.repo.git.format_patch({timeout: 30, raise: true, stdout: true}, "#{target_branch}..#{source_branch}")
  end
201 202 203 204

  def last_commit_short_sha
    @last_commit_short_sha ||= last_commit.sha[0..10]
  end
205 206 207 208 209 210 211 212 213 214

  private

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

  def load_commits(array)
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
  end
215 216

  def dump_diffs(diffs)
217
    if diffs == broken_diffs
218
      broken_diffs
219
    elsif diffs.respond_to?(:map)
220 221 222 223 224 225 226
      diffs.map(&:to_hash)
    end
  end

  def load_diffs(raw)
    if raw == broken_diffs
      broken_diffs
227
    elsif raw.respond_to?(:map)
228 229
      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
    end
230 231
  end

232 233
  def broken_diffs
    [Gitlab::Git::Diff::BROKEN_DIFF]
234
  end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
235
end