merge_request.rb 18.1 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1
class MergeRequest < ActiveRecord::Base
2
  include InternalId
3 4
  include Issuable
  include Referable
5
  include Sortable
6
  include Taskable
7
  include Importable
8

9 10
  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 已提交
11
  belongs_to :merge_user, class_name: "User"
12

13
  has_many :merge_request_diffs, dependent: :destroy
14 15
  has_many :events, as: :target, dependent: :destroy

Z
Zeger-Jan van de Weg 已提交
16 17
  serialize :merge_params, Hash

D
Dmitriy Zaporozhets 已提交
18
  after_update :update_merge_request_diff
19

S
Sean McGivern 已提交
20
  delegate :commits, :real_size, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
21

D
Dmitriy Zaporozhets 已提交
22 23 24 25
  # 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 已提交
26 27
  # Temporary fields to store compare vars
  # when creating new merge request
J
Jacob Vosmaer 已提交
28
  attr_accessor :can_be_created, :compare_commits, :compare
D
Dmitriy Zaporozhets 已提交
29

A
Andrew8xx8 已提交
30
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
31 32 33 34
    event :close do
      transition [:reopened, :opened] => :closed
    end

35
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
36
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
37 38 39
    end

    event :reopen do
A
Andrew8xx8 已提交
40
      transition closed: :reopened
A
Andrew8xx8 已提交
41 42
    end

43
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
44 45 46
      transition [:reopened, :opened] => :locked
    end

47
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
48 49 50
      transition locked: :reopened
    end

51 52 53 54 55
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

56
    after_transition locked: (any - :locked) do |merge_request, transition|
57 58 59 60
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
61 62 63 64
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
65
    state :locked
A
Andrew8xx8 已提交
66 67
  end

68 69 70 71 72 73
  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
74
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
75 76 77
    end

    event :mark_as_unmergeable do
78
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
79 80
    end

81
    state :unchecked
82 83
    state :can_be_merged
    state :cannot_be_merged
84 85

    around_transition do |merge_request, transition, block|
86
      Gitlab::Timeless.timeless(merge_request, &block)
87
    end
88
  end
89

90
  validates :source_project, presence: true, unless: [:allow_broken, :importing?]
A
Andrey Kumanyaev 已提交
91
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
92
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
93
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
94
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
95
  validate :validate_branches, unless: [:allow_broken, :importing?]
96
  validate :validate_fork
97
  validates_associated :merge_request_diff, on: :create, unless: [:allow_broken, :importing?]
D
Dmitriy Zaporozhets 已提交
98

I
Izaak Alpert 已提交
99
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
100
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
101
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
102
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
103
  scope :from_project, ->(project) { where(source_project_id: project.id) }
104 105
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
106

107 108 109
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

110 111
  after_save :keep_around_commit

112 113 114 115
  def self.reference_prefix
    '!'
  end

116 117 118 119
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
120
    @reference_pattern ||= %r{
121
      (#{Project.reference_pattern})?
122 123 124 125
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

126
  def self.link_reference_pattern
127
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
128 129
  end

130 131 132 133
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151
  # Returns all the merge requests from an ActiveRecord:Relation.
  #
  # This method uses a UNION as it usually operates on the result of
  # ProjectsFinder#execute. PostgreSQL in particular doesn't always like queries
  # using multiple sub-queries especially when combined with an OR statement.
  # UNIONs on the other hand perform much better in these cases.
  #
  # relation - An ActiveRecord::Relation that returns a list of Projects.
  #
  # Returns an ActiveRecord::Relation.
  def self.in_projects(relation)
    source = where(source_project_id: relation).select(:id)
    target = where(target_project_id: relation).select(:id)
    union  = Gitlab::SQL::Union.new([source, target])

    where("merge_requests.id IN (#{union.to_sql})")
  end

152 153 154 155 156 157 158 159 160 161
  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

162 163
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
164
  end
165

S
Sean McGivern 已提交
166 167 168 169
  def diffs(*args)
    merge_request_diff ? merge_request_diff.diffs(*args) : compare.diffs(*args)
  end

J
Jacob Vosmaer 已提交
170 171 172 173
  def diff_size
    merge_request_diff.size
  end

174
  def diff_base_commit
175
    if persisted?
176
      merge_request_diff.base_commit
177 178 179 180 181 182 183 184 185 186 187
    elsif diff_start_commit && diff_head_commit
      self.target_project.merge_base_commit(diff_start_sha, diff_head_sha)
    end
  end

  # MRs created before 8.4 don't store a MergeRequestDiff#base_commit_sha,
  # but we need to get a commit for the "View file @ ..." link by deleted files,
  # so we find the likely one if we can't get the actual one.
  # This will not be the actual base commit if the target branch was merged into
  # the source branch after the merge request was created, but it is good enough
  # for the specific purpose of linking to a commit.
D
Douwe Maan 已提交
188 189 190
  # It is not good enough for use in `Gitlab::Git::DiffRefs`, which needs the
  # true base commit, so we can't simply have `#diff_base_commit` fall back on
  # this method.
191 192 193 194 195 196 197 198 199
  def likely_diff_base_commit
    first_commit.parent || first_commit
  end

  def diff_start_commit
    if persisted?
      merge_request_diff.start_commit
    else
      target_branch_head
200 201 202
    end
  end

203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
  def diff_head_commit
    if persisted?
      merge_request_diff.head_commit
    else
      source_branch_head
    end
  end

  def diff_start_sha
    diff_start_commit.try(:sha)
  end

  def diff_base_sha
    diff_base_commit.try(:sha)
  end

  def diff_head_sha
    diff_head_commit.try(:sha)
  end

  # When importing a pull request from GitHub, the old and new branches may no
  # longer actually exist by those names, but we need to recreate the merge
  # request diff with the right source and target shas.
  # We use these attributes to force these to the intended values.
  attr_writer :target_branch_sha, :source_branch_sha

  def source_branch_head
    source_branch_ref = @source_branch_sha || source_branch
    source_project.repository.commit(source_branch) if source_branch_ref
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
    target_project.repository.commit(target_branch) if target_branch_ref
  end

  def target_branch_sha
240
    @target_branch_sha || target_branch_head.try(:sha)
241 242 243
  end

  def source_branch_sha
244
    @source_branch_sha || source_branch_head.try(:sha)
245 246
  end

247
  def diff_refs
248 249 250
    if merge_request_diff
      merge_request_diff.diff_refs
    end
251 252
  end

253
  def validate_branches
254
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
255
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
256
    end
257

258
    if opened? || reopened?
259
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
260 261
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
262
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
263
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
264
      end
265
    end
266 267
  end

268
  def validate_fork
269 270 271
    return true unless target_project && source_project

    if target_project == source_project
272 273 274 275 276 277 278
      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 已提交
279 280
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
281 282 283 284
      end
    end
  end

285 286 287 288
  def create_merge_request_diff
    merge_request_diffs.create
  end

D
Dmitriy Zaporozhets 已提交
289 290
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
291
      reload_diff
D
Dmitriy Zaporozhets 已提交
292 293 294
    end
  end

295
  def reload_diff
296 297
    return unless open?

298
    old_diff_refs = self.diff_refs
299
    create_merge_request_diff
300
    merge_request_diffs.reload
301 302 303 304 305 306
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
307 308
  end

309
  def check_if_can_be_merged
310 311
    return unless unchecked?

312
    can_be_merged =
313
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
314 315

    if can_be_merged
316 317 318 319
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
320 321
  end

D
Dmitriy Zaporozhets 已提交
322
  def merge_event
323
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
324 325
  end

326
  def closed_event
327
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
328 329
  end

330
  WIP_REGEX = /\A\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze
331

332
  def work_in_progress?
333
    !!(title =~ WIP_REGEX)
334 335 336 337
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
338 339
  end

340 341
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
342 343 344 345

    check_if_can_be_merged

    can_be_merged?
346 347
  end

348
  def mergeable_state?(skip_ci_check: false)
349 350 351
    return false unless open?
    return false if work_in_progress?
    return false if broken?
352
    return false unless skip_ci_check || mergeable_ci_state?
353 354

    true
355 356
  end

357 358
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
359 360
  end

361 362 363
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
364
      Ability.abilities.allowed?(current_user, :push_code, source_project) &&
365
      diff_head_commit == source_branch_head
366 367
  end

368 369 370 371 372 373 374 375 376 377 378 379
  def should_remove_source_branch?
    merge_params['should_remove_source_branch'].present?
  end

  def force_remove_source_branch?
    merge_params['force_remove_source_branch'].present?
  end

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

380
  def mr_and_commit_notes
381 382 383 384
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

385 386
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
387
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
388
      mr_id: id,
389 390 391
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
392
    )
393
  end
394

K
Kirill Zaitsev 已提交
395 396
  def hook_attrs
    attrs = {
397
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
398
      target: target_project.hook_attrs,
399 400
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
401 402
    }

403 404
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
405 406 407 408 409
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
410 411 412 413
  def for_fork?
    target_project != source_project
  end

414 415 416 417
  def project
    target_project
  end

418 419 420 421
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

422
  # Return the set of issues that will be closed if this merge request is accepted.
423
  def closes_issues(current_user = self.author)
424
    if target_branch == project.default_branch
425 426 427 428
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
429 430 431 432 433
    else
      []
    end
  end

434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449
  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

450 451 452 453 454 455 456 457
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

458 459 460 461 462 463 464 465
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

466 467 468 469 470 471 472 473 474 475 476 477
  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 已提交
478 479 480 481 482 483 484 485 486
  # 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
487
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
488 489
  end

490 491 492
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
493
    message << title.to_s
494
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
495
    message << description.to_s
496 497
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
498
    message
499
  end
500

Z
Zeger-Jan van de Weg 已提交
501 502
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
503

Z
Zeger-Jan van de Weg 已提交
504 505
    self.merge_when_build_succeeds = false
    self.merge_user = nil
506 507 508 509
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
510 511 512 513

    self.save
  end

514
  # Return array of possible target branches
S
Steven Burgart 已提交
515
  # depends on target project of MR
516 517 518 519 520 521 522 523 524
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
525
  # depends on source project of MR
526 527 528 529 530 531 532
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
533 534

  def locked_long_ago?
B
Ben Bodenmiller 已提交
535 536 537
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
538
  end
539 540 541 542 543 544 545 546

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

  def branch_missing?
    !source_branch_exists? || !target_branch_exists?
  end
547

548 549 550 551
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

552
  def can_be_merged_by?(user)
553 554 555 556 557 558 559
    access = ::Gitlab::UserAccess.new(user, project: project)
    access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch)
  end

  def can_be_merged_via_command_line_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: project)
    access.can_push_to_branch?(target_branch)
560 561
  end

562 563
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
564

R
Rémy Coutable 已提交
565
    !pipeline || pipeline.success?
566 567
  end

568 569 570 571 572 573 574 575 576
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
577

578 579 580 581 582 583 584 585 586 587
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

588 589 590 591
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
592
      ref_path
593 594 595
    )
  end

596 597 598 599
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

600 601
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
602 603 604
  end

  def ensure_ref_fetched
605
    fetch_ref unless ref_fetched?
606 607
  end

608 609 610 611 612 613 614 615
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
616

617 618 619
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

620
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
621
      cache = {
622 623
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
624 625 626 627 628 629 630 631 632
        diverged_commits_count: compute_diverged_commits_count
      }
      Rails.cache.write(:"merge_request_#{id}_diverged_commits", cache)
    end

    cache[:diverged_commits_count]
  end

  def compute_diverged_commits_count
633
    return 0 unless source_branch_sha && target_branch_sha
634

635
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
636
  end
637
  private :compute_diverged_commits_count
638 639 640 641 642

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

643
  def pipeline
644
    @pipeline ||= source_project.pipeline(diff_head_sha, source_branch) if diff_head_sha && source_project
645
  end
646 647 648 649 650

  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

651 652
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
653
  end
654 655 656 657

  def can_be_cherry_picked?
    merge_commit
  end
658

659 660 661 662
  def support_new_diff_notes?
    diff_refs && diff_refs.complete?
  end

663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
    return unless support_new_diff_notes?
    return if new_diff_refs == old_diff_refs

    active_diff_notes = self.notes.diff_notes.select do |note|
      note.new_diff_note? && note.active?(old_diff_refs)
    end

    return if active_diff_notes.empty?

    paths = active_diff_notes.flat_map { |n| n.diff_file.paths }.uniq

    service = Notes::DiffPositionUpdateService.new(
      self.project,
      nil,
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs,
      paths: paths
    )

    active_diff_notes.each do |note|
      service.execute(note)
      Gitlab::Timeless.timeless(note, &:save)
    end
  end

689 690 691
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
692 693 694 695

  def merge_request_diff
    merge_request_diffs.first
  end
D
Dmitriy Zaporozhets 已提交
696
end