merge_request.rb 8.0 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3 4
# == Schema Information
#
# Table name: merge_requests
#
D
Dmitriy Zaporozhets 已提交
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
#  id                :integer          not null, primary key
#  target_branch     :string(255)      not null
#  source_branch     :string(255)      not null
#  source_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)
#  milestone_id      :integer
#  state             :string(255)
#  merge_status      :string(255)
#  target_project_id :integer          not null
#  iid               :integer
D
Dmitriy Zaporozhets 已提交
21
#  description       :text
D
Dmitriy Zaporozhets 已提交
22
#
D
Dmitriy Zaporozhets 已提交
23

24
require Rails.root.join("app/models/commit")
25
require Rails.root.join("lib/static_model")
26

D
Dmitriy Zaporozhets 已提交
27
class MergeRequest < ActiveRecord::Base
28
  include Issuable
29
  include InternalId
30

31 32
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
I
Izaak Alpert 已提交
33

34
  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description
35

A
Andrey Kumanyaev 已提交
36 37
  attr_accessor :should_remove_source_branch

A
Andrew8xx8 已提交
38
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
39 40 41 42 43 44 45 46 47
    event :close do
      transition [:reopened, :opened] => :closed
    end

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

    event :reopen do
A
Andrew8xx8 已提交
48
      transition closed: :reopened
A
Andrew8xx8 已提交
49 50 51 52 53 54 55 56 57 58 59
    end

    state :opened

    state :reopened

    state :closed

    state :merged
  end

60 61 62 63 64 65 66 67 68 69 70 71 72
  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

73
    state :unchecked
74

75 76 77 78
    state :can_be_merged

    state :cannot_be_merged
  end
79

80 81 82
  serialize :st_commits
  serialize :st_diffs

I
Izaak Alpert 已提交
83
  validates :source_project, presence: true
A
Andrey Kumanyaev 已提交
84
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
85
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
86
  validates :target_branch, presence: true
I
Izaak Alpert 已提交
87
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
88

89 90
  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
  scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
I
Izaak Alpert 已提交
91 92
  scope :opened, -> { with_state(:opened) }
  scope :closed, -> { with_state(:closed) }
A
Andrew8xx8 已提交
93
  scope :merged, -> { with_state(:merged) }
I
Izaak Alpert 已提交
94
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
95
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
96
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
97
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
98
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
99 100 101 102
  # Closed scope for merge request should return
  # both merged and closed mr's
  scope :closed, -> { with_states(:closed, :merged) }

103
  def validate_branches
I
Izaak Alpert 已提交
104 105
    if target_project==source_project && target_branch == source_branch
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
106
    end
107

108
    if opened? || reopened?
I
Izaak Alpert 已提交
109
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
110
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
111

112
      if similar_mrs.any?
I
Izaak Alpert 已提交
113
        errors.add :base, "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
114
      end
115
    end
116 117
  end

118 119 120 121 122
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

123
  def check_if_can_be_merged
124 125 126 127 128
    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
129 130
  end

D
Dmitriy Zaporozhets 已提交
131
  def diffs
132
    @diffs ||= (load_diffs(st_diffs) || [])
133 134 135
  end

  def reloaded_diffs
A
Andrew8xx8 已提交
136
    if opened? && unmerged_diffs.any?
137
      self.st_diffs = dump_diffs(unmerged_diffs)
138
      self.save
139
    end
140 141 142
  end

  def broken_diffs?
143
    diffs == broken_diffs
144 145
  rescue
    true
146 147 148 149
  end

  def valid_diffs?
    !broken_diffs?
150 151 152
  end

  def unmerged_diffs
153 154 155
    diffs = if for_fork?
              Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
            else
156
              Gitlab::Git::Diff.between(target_project.repository, source_branch, target_branch)
157 158
            end

159
    diffs ||= []
I
Izaak Alpert 已提交
160
    diffs
D
Dmitriy Zaporozhets 已提交
161 162 163
  end

  def last_commit
164
    commits.first
D
Dmitriy Zaporozhets 已提交
165
  end
166

D
Dmitriy Zaporozhets 已提交
167
  def merge_event
I
Izaak Alpert 已提交
168
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
169 170
  end

171
  def closed_event
I
Izaak Alpert 已提交
172
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
173 174
  end

175
  def commits
176
    load_commits(st_commits || [])
177 178 179
  end

  def probably_merged?
180
    unmerged_commits.empty? &&
181
      commits.any? && opened?
182 183
  end

184
  def reloaded_commits
A
Andrew8xx8 已提交
185
    if opened? && unmerged_commits.any?
186
      self.st_commits = dump_commits(unmerged_commits)
187
      save
I
Izaak Alpert 已提交
188

189 190 191 192 193
    end
    commits
  end

  def unmerged_commits
194 195 196 197 198
    if for_fork?
      commits = Gitlab::Satellite::MergeAction.new(self.author, self).commits_between
    else
      commits = target_project.repository.commits_between(self.target_branch, self.source_branch)
    end
199

I
Izaak Alpert 已提交
200 201
    if commits.present?
      commits = Commit.decorate(commits).
202 203
      sort_by(&:created_at).
      reverse
I
Izaak Alpert 已提交
204 205
    end
    commits
206
  end
207 208

  def merge!(user_id)
209
    self.author_id_of_changes = user_id
A
Andrew8xx8 已提交
210
    self.merge
211
  end
212

213
  def automerge!(current_user)
214
    if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
215 216 217
      self.merge!(current_user.id)
      true
    end
Z
Zevs 已提交
218
  rescue
219
    mark_as_unmergeable
220 221
    false
  end
R
randx 已提交
222

223 224
  def mr_and_commit_notes
    commit_ids = commits.map(&:id)
225
    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)
226
  end
227

228 229 230
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
231 232
  def to_diff(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).diff_in_satellite
233 234 235 236 237
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
I
Izaak Alpert 已提交
238 239
  def to_patch(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
240
  end
241 242 243 244

  def last_commit_short_sha
    @last_commit_short_sha ||= last_commit.sha[0..10]
  end
245

I
Izaak Alpert 已提交
246 247 248 249 250 251 252 253
  def for_fork?
    target_project != source_project
  end

  def disallow_source_branch_removal?
    (source_project.root_ref? source_branch) || for_fork?
  end

254 255 256 257
  def project
    target_project
  end

258 259 260 261 262 263 264 265 266 267 268 269 270 271
  # Return the set of issues that will be closed if this merge request is accepted.
  def closes_issues
    if target_branch == project.default_branch
      unmerged_commits.map { |c| c.closes_issues(project) }.flatten.uniq.sort_by(&:id)
    else
      []
    end
  end

  # Mentionable override.
  def gfm_reference
    "merge request !#{iid}"
  end

272 273 274 275 276 277 278 279 280
  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
281 282

  def dump_diffs(diffs)
283
    if diffs == broken_diffs
284
      broken_diffs
285
    elsif diffs.respond_to?(:map)
286 287 288 289 290 291 292
      diffs.map(&:to_hash)
    end
  end

  def load_diffs(raw)
    if raw == broken_diffs
      broken_diffs
293
    elsif raw.respond_to?(:map)
294 295
      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
    end
296 297
  end

298 299
  def broken_diffs
    [Gitlab::Git::Diff::BROKEN_DIFF]
300
  end
D
Dmitriy Zaporozhets 已提交
301
end