merge_request.rb 12.5 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
#  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)
D
Dmitriy Zaporozhets 已提交
12 13
#  created_at        :datetime
#  updated_at        :datetime
D
Dmitriy Zaporozhets 已提交
14 15 16 17 18
#  milestone_id      :integer
#  state             :string(255)
#  merge_status      :string(255)
#  target_project_id :integer          not null
#  iid               :integer
D
Dmitriy Zaporozhets 已提交
19
#  description       :text
D
Dmitriy Zaporozhets 已提交
20
#  position          :integer          default(0)
D
Dmitriy Zaporozhets 已提交
21
#  locked_at         :datetime
S
Stan Hu 已提交
22
#  updated_by_id     :integer
D
Dmitriy Zaporozhets 已提交
23
#  merge_error       :string(255)
D
Dmitriy Zaporozhets 已提交
24
#
D
Dmitriy Zaporozhets 已提交
25

26
require Rails.root.join("app/models/commit")
27
require Rails.root.join("lib/static_model")
28

D
Dmitriy Zaporozhets 已提交
29
class MergeRequest < ActiveRecord::Base
30
  include InternalId
31 32
  include Issuable
  include Referable
33
  include Sortable
34
  include Taskable
35

36 37
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
Z
Zeger-Jan van de Weg 已提交
38
  belongs_to :merge_user, class_name: "User"
39

40
  has_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
41

Z
Zeger-Jan van de Weg 已提交
42 43
  serialize :merge_params, Hash

44
  after_create :create_merge_request_diff
D
Dmitriy Zaporozhets 已提交
45
  after_update :update_merge_request_diff
46

47
  delegate :commits, :diffs, :diffs_no_whitespace, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
48

D
Dmitriy Zaporozhets 已提交
49 50 51 52
  # When this attribute is true some MR validation is ignored
  # It allows us to close or modify broken merge requests
  attr_accessor :allow_broken

D
Dmitriy Zaporozhets 已提交
53 54
  # Temporary fields to store compare vars
  # when creating new merge request
D
Dmitriy Zaporozhets 已提交
55
  attr_accessor :can_be_created, :compare_failed,
56
    :compare_commits, :compare_diffs
D
Dmitriy Zaporozhets 已提交
57

A
Andrew8xx8 已提交
58
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
59 60 61 62
    event :close do
      transition [:reopened, :opened] => :closed
    end

63
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
64
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
65 66 67
    end

    event :reopen do
A
Andrew8xx8 已提交
68
      transition closed: :reopened
A
Andrew8xx8 已提交
69 70
    end

71
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
72 73 74
      transition [:reopened, :opened] => :locked
    end

75
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
76 77 78
      transition locked: :reopened
    end

79 80 81 82 83
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

84
    after_transition locked: (any - :locked) do |merge_request, transition|
85 86 87 88
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
89 90 91 92
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
93
    state :locked
A
Andrew8xx8 已提交
94 95
  end

96 97 98 99 100 101
  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
102
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
103 104 105
    end

    event :mark_as_unmergeable do
106
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
107 108
    end

109
    state :unchecked
110 111
    state :can_be_merged
    state :cannot_be_merged
112 113 114 115 116 117 118 119 120

    around_transition do |merge_request, transition, block|
      merge_request.record_timestamps = false
      begin
        block.call
      ensure
        merge_request.record_timestamps = true
      end
    end
121
  end
122

D
Dmitriy Zaporozhets 已提交
123
  validates :source_project, presence: true, unless: :allow_broken
A
Andrey Kumanyaev 已提交
124
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
125
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
126
  validates :target_branch, presence: true
I
Izaak Alpert 已提交
127
  validate :validate_branches
128
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
129

130
  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) }
I
Izaak Alpert 已提交
131
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
132
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
133
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
134
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
135
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
136 137 138
  scope :merged, -> { with_state(:merged) }
  scope :closed, -> { with_state(:closed) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
139

140 141 142 143
  def self.reference_prefix
    '!'
  end

144 145 146 147 148
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
    %r{
149
      (#{Project.reference_pattern})?
150 151 152 153
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

154 155 156 157 158 159 160 161 162 163
  def to_reference(from_project = nil)
    reference = "#{self.class.reference_prefix}#{iid}"

    if cross_project_reference?(from_project)
      reference = project.to_reference + reference
    end

    reference
  end

164 165
  def last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
166
  end
167 168 169

  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
170
  end
171 172 173 174 175

  def last_commit_short_sha
    last_commit.short_id
  end

176
  def validate_branches
177
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
178
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
179
    end
180

181
    if opened? || reopened?
I
Izaak Alpert 已提交
182
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
183 184
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
185 186 187 188
        errors.add :validate_branches,
                   "Cannot Create: This merge request already exists: #{
                   similar_mrs.pluck(:title)
                   }"
189
      end
190
    end
191 192
  end

193
  def validate_fork
194 195 196
    return true unless target_project && source_project

    if target_project == source_project
197 198 199 200 201 202 203
      true
    else
      # If source and target projects are different
      # we should check if source project is actually a fork of target project
      if source_project.forked_from?(target_project)
        true
      else
J
jubianchi 已提交
204 205
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
206 207 208 209
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
210 211 212 213 214 215
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

216
  def reload_code
217
    if merge_request_diff && open?
218 219
      merge_request_diff.reload_content
    end
220 221
  end

222
  def check_if_can_be_merged
223 224 225 226
    can_be_merged =
      project.repository.can_be_merged?(source_sha, target_branch)

    if can_be_merged
227 228 229 230
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
231 232
  end

D
Dmitriy Zaporozhets 已提交
233
  def merge_event
I
Izaak Alpert 已提交
234
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
235 236
  end

237
  def closed_event
I
Izaak Alpert 已提交
238
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
239 240
  end

241
  def work_in_progress?
242
    !!(title =~ /\A\[?WIP\]?:? /i)
243 244
  end

245
  def mergeable?
246 247 248
    open? && !work_in_progress? && can_be_merged?
  end

249
  def gitlab_merge_status
250 251 252 253 254 255 256
    if work_in_progress?
      "work_in_progress"
    else
      merge_status_name
    end
  end

257 258 259 260
  def mergeable_by_or_author(user)
    self.can_be_merged_by?(user) || self.author == user
  end

261
  def mr_and_commit_notes
262 263 264 265
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

266 267
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
268
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
269
      mr_id: id,
270 271 272
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
273
    )
274
  end
275

276 277 278
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
279
  def to_diff(current_user)
280
    target_project.repository.diff_text(target_branch, source_sha)
281 282 283 284 285
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
I
Izaak Alpert 已提交
286
  def to_patch(current_user)
287
    target_project.repository.format_patch(target_branch, source_sha)
288
  end
289

K
Kirill Zaitsev 已提交
290 291 292 293
  def hook_attrs
    attrs = {
      source: source_project.hook_attrs,
      target: target_project.hook_attrs,
294 295
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
296 297 298
    }

    unless last_commit.nil?
299
      attrs.merge!(last_commit: last_commit.hook_attrs)
K
Kirill Zaitsev 已提交
300 301 302 303 304
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
305 306 307 308
  def for_fork?
    target_project != source_project
  end

309 310 311 312
  def project
    target_project
  end

313 314 315 316
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

317
  # Return the set of issues that will be closed if this merge request is accepted.
318
  def closes_issues(current_user = self.author)
319
    if target_branch == project.default_branch
320
      issues = commits.flat_map { |c| c.closes_issues(current_user) }
D
Douwe Maan 已提交
321 322
      issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user).
                  closed_by_message(description))
323
      issues.uniq.sort_by(&:id)
324 325 326 327 328
    else
      []
    end
  end

329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344
  def target_project_path
    if target_project
      target_project.path_with_namespace
    else
      "(removed)"
    end
  end

  def source_project_path
    if source_project
      source_project.path_with_namespace
    else
      "(removed)"
    end
  end

345 346 347 348 349 350 351 352
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

353 354 355 356 357 358 359 360
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

361 362 363 364 365 366 367 368 369 370 371 372
  def source_branch_exists?
    return false unless self.source_project

    self.source_project.repository.branch_names.include?(self.source_branch)
  end

  def target_branch_exists?
    return false unless self.target_project

    self.target_project.repository.branch_names.include?(self.target_branch)
  end

D
Drew Blessing 已提交
373 374 375 376 377 378 379 380 381
  # Reset merge request events cache
  #
  # Since we do cache @event we need to reset cache in special cases:
  # * when a merge request is updated
  # Events cache stored like  events/23-20130109142513.
  # The cache key includes updated_at timestamp.
  # Thus it will automatically generate a new fragment
  # when the event is updated because the key changes.
  def reset_events_cache
382
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
383 384
  end

385 386 387
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
388
    message << title.to_s
389
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
390
    message << description.to_s
391 392
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
393
    message
394
  end
395

Z
Zeger-Jan van de Weg 已提交
396 397
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
398

Z
Zeger-Jan van de Weg 已提交
399 400 401 402 403 404 405
    self.merge_when_build_succeeds = false
    self.merge_user = nil
    self.merge_params = nil

    self.save
  end

406
  # Return array of possible target branches
S
Steven Burgart 已提交
407
  # depends on target project of MR
408 409 410 411 412 413 414 415 416
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
417
  # depends on source project of MR
418 419 420 421 422 423 424
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
425 426

  def locked_long_ago?
B
Ben Bodenmiller 已提交
427 428 429
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
430
  end
431 432 433 434 435 436 437 438

  def has_ci?
    source_project.ci_service && commits.any?
  end

  def branch_missing?
    !source_branch_exists? || !target_branch_exists?
  end
439 440 441 442

  def can_be_merged_by?(user)
    ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
  end
443 444 445 446 447 448 449 450 451 452

  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
453 454 455 456 457 458 459 460 461 462 463 464 465 466

  def target_sha
    @target_sha ||= target_project.
      repository.commit(target_branch).sha
  end

  def source_sha
    commits.first.sha
  end

  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
467
      ref_path
468 469 470
    )
  end

471 472 473 474 475 476 477 478 479 480 481 482
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

  def ref_is_fetched?
    File.exists?(File.join(project.repository.path_to_repo, ref_path))
  end

  def ensure_ref_fetched
    fetch_ref unless ref_is_fetched?
  end

483 484 485 486 487 488 489 490
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
491 492 493 494 495 496

  def ci_commit
    if last_commit
      source_project.ci_commit(last_commit.id)
    end
  end
D
Dmitriy Zaporozhets 已提交
497
end