merge_request.rb 24.4 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 Importable
7

8 9
  belongs_to :target_project, class_name: "Project"
  belongs_to :source_project, class_name: "Project"
Z
Zeger-Jan van de Weg 已提交
10
  belongs_to :merge_user, class_name: "User"
11

12
  has_many :merge_request_diffs, dependent: :destroy
13 14 15
  has_one :merge_request_diff,
    -> { order('merge_request_diffs.id DESC') }

16 17
  has_many :events, as: :target, dependent: :destroy

18
  has_many :merge_requests_closing_issues, class_name: 'MergeRequestsClosingIssues', dependent: :delete_all
19

Z
Zeger-Jan van de Weg 已提交
20 21
  serialize :merge_params, Hash

22 23
  after_create :ensure_merge_request_diff, unless: :importing?
  after_update :reload_diff_if_branch_changed
24

25 26
  delegate :commits, :real_size, :commits_sha, :commits_count,
    to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
27

D
Dmitriy Zaporozhets 已提交
28 29 30 31
  # 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 已提交
32 33
  # Temporary fields to store compare vars
  # when creating new merge request
34
  attr_accessor :can_be_created, :compare_commits, :diff_options, :compare
D
Dmitriy Zaporozhets 已提交
35

A
Andrew8xx8 已提交
36
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
37 38 39 40
    event :close do
      transition [:reopened, :opened] => :closed
    end

41
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
42
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
43 44 45
    end

    event :reopen do
A
Andrew8xx8 已提交
46
      transition closed: :reopened
A
Andrew8xx8 已提交
47 48
    end

49
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
50 51 52
      transition [:reopened, :opened] => :locked
    end

53
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
54 55 56
      transition locked: :reopened
    end

57 58 59 60 61
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

62
    after_transition locked: (any - :locked) do |merge_request, transition|
63 64 65 66
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
67 68 69 70
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
71
    state :locked
A
Andrew8xx8 已提交
72 73
  end

74 75 76 77 78 79
  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
80
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
81 82 83
    end

    event :mark_as_unmergeable do
84
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
85 86
    end

87
    state :unchecked
88 89
    state :can_be_merged
    state :cannot_be_merged
90 91

    around_transition do |merge_request, transition, block|
92
      Gitlab::Timeless.timeless(merge_request, &block)
93
    end
94 95 96 97

    after_transition unchecked: :cannot_be_merged do |merge_request, transition|
      TodoService.new.merge_request_became_unmergeable(merge_request)
    end
98
  end
99

100
  validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
A
Andrey Kumanyaev 已提交
101
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
102
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
103
  validates :target_branch, presence: true
J
James Lopez 已提交
104
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?, unless: :importing?
105 106
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
D
Dmitriy Zaporozhets 已提交
107

108 109 110
  scope :by_source_or_target_branch, ->(branch_name) do
    where("source_branch = :branch OR target_branch = :branch", branch: branch_name)
  end
A
Andrew8xx8 已提交
111
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
112
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
113
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
114
  scope :from_project, ->(project) { where(source_project_id: project.id) }
115 116
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
S
Scott Le 已提交
117
  scope :from_source_branches, ->(branches) { where(source_branch: branches) }
118

119 120 121
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

122 123
  after_save :keep_around_commit

124 125 126 127
  def self.reference_prefix
    '!'
  end

128 129 130 131
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
132
    @reference_pattern ||= %r{
133
      (#{Project.reference_pattern})?
134 135 136 137
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

138
  def self.link_reference_pattern
139
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
140 141
  end

142 143 144 145
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

146 147 148 149
  def self.project_foreign_key
    'target_project_id'
  end

150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167
  # 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

T
Thomas Balthazar 已提交
168 169 170 171 172 173 174 175 176 177 178 179 180 181
  WIP_REGEX = /\A\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze

  def self.work_in_progress?(title)
    !!(title =~ WIP_REGEX)
  end

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

  def self.wip_title(title)
    work_in_progress?(title) ? title : "WIP: #{title}"
  end

182
  # `from` argument can be a Namespace or Project.
183
  def to_reference(from = nil, full: false)
184 185
    reference = "#{self.class.reference_prefix}#{iid}"

186
    "#{project.to_reference(from, full: full)}#{reference}"
187 188
  end

189 190
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
191
  end
192

193
  def raw_diffs(*args)
194
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
195 196
  end

197
  def diffs(diff_options = nil)
198 199
    if compare
      compare.diffs(diff_options)
200
    else
201
      merge_request_diff.diffs(diff_options)
202
    end
S
Sean McGivern 已提交
203 204
  end

J
Jacob Vosmaer 已提交
205
  def diff_size
206 207 208
    opts = diff_options || {}

    raw_diffs(opts).size
J
Jacob Vosmaer 已提交
209 210
  end

211
  def diff_base_commit
212
    if persisted?
213
      merge_request_diff.base_commit
214 215
    else
      branch_merge_base_commit
216 217 218 219 220 221 222 223 224
    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 已提交
225 226 227
  # 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.
228
  def likely_diff_base_commit
229
    first_commit.try(:parent) || first_commit
230 231 232 233 234 235 236
  end

  def diff_start_commit
    if persisted?
      merge_request_diff.start_commit
    else
      target_branch_head
237 238 239
    end
  end

240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
  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
S
Sean McGivern 已提交
268
    source_project.repository.commit(source_branch_ref) if source_branch_ref
269 270 271 272
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
273
    target_project.repository.commit(target_branch_ref) if target_branch_ref
274 275
  end

276 277 278 279 280 281 282 283 284
  def branch_merge_base_commit
    start_sha = target_branch_sha
    head_sha  = source_branch_sha

    if start_sha && head_sha
      target_project.merge_base_commit(start_sha, head_sha)
    end
  end

285
  def target_branch_sha
286
    @target_branch_sha || target_branch_head.try(:sha)
287 288 289
  end

  def source_branch_sha
290
    @source_branch_sha || source_branch_head.try(:sha)
291 292
  end

293 294 295 296 297 298 299 300
  def diff_refs
    return unless diff_start_commit || diff_base_commit

    Gitlab::Diff::DiffRefs.new(
      base_sha:  diff_base_sha,
      start_sha: diff_start_sha,
      head_sha:  diff_head_sha
    )
301 302
  end

303 304
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
305
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
306
      merge_request_diff.diff_refs
307
    else
308
      diff_refs
309
    end
310 311
  end

312 313 314 315
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

316
  def validate_branches
317
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
318
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
319
    end
320

321
    if opened? || reopened?
322
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
323 324
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
325
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
326
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
327
      end
328
    end
329 330
  end

331
  def validate_fork
332
    return true unless target_project && source_project
333
    return true if target_project == source_project
334
    return true unless source_project_missing?
335

336
    errors.add :validate_fork,
337
               'Source project is not a fork of the target project'
338 339 340
  end

  def closed_without_fork?
341
    closed? && source_project_missing?
342 343
  end

344
  def source_project_missing?
345 346 347 348
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
349 350
  end

351
  def reopenable?
352
    closed? && !source_project_missing? && source_branch_exists?
K
Katarzyna Kobierska 已提交
353 354
  end

355 356
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
357 358
  end

359 360 361 362 363 364 365 366 367
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

368
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
369
    if source_branch_changed? || target_branch_changed?
370
      reload_diff
D
Dmitriy Zaporozhets 已提交
371 372 373
    end
  end

374
  def reload_diff
375 376
    return unless open?

377
    old_diff_refs = self.diff_refs
378
    create_merge_request_diff
379
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
380 381 382 383 384 385
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
386 387
  end

388
  def check_if_can_be_merged
389 390
    return unless unchecked?

391
    can_be_merged =
392
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
393 394

    if can_be_merged
395 396 397 398
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
399 400
  end

D
Dmitriy Zaporozhets 已提交
401
  def merge_event
402
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
403 404
  end

405
  def closed_event
406
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
407 408
  end

409
  def work_in_progress?
T
Thomas Balthazar 已提交
410
    self.class.work_in_progress?(title)
411 412 413
  end

  def wipless_title
T
Thomas Balthazar 已提交
414 415 416 417 418
    self.class.wipless_title(self.title)
  end

  def wip_title
    self.class.wip_title(self.title)
419 420
  end

421 422
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
423 424 425 426

    check_if_can_be_merged

    can_be_merged?
427 428
  end

429
  def mergeable_state?(skip_ci_check: false)
430 431 432
    return false unless open?
    return false if work_in_progress?
    return false if broken?
433
    return false unless skip_ci_check || mergeable_ci_state?
434
    return false unless mergeable_discussions_state?
435 436

    true
437 438
  end

439 440
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
441 442
  end

443 444 445
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
446
      Ability.allowed?(current_user, :push_code, source_project) &&
447
      diff_head_commit == source_branch_head
448 449
  end

450
  def should_remove_source_branch?
451
    Gitlab::Utils.to_boolean(merge_params['should_remove_source_branch'])
452 453 454
  end

  def force_remove_source_branch?
455
    Gitlab::Utils.to_boolean(merge_params['force_remove_source_branch'])
456 457 458 459 460 461
  end

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

462
  def related_notes
463 464 465 466
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

467 468
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
469
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
470
      mr_id: id,
471 472 473
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
474
    )
475
  end
476

477
  def discussions
478
    @discussions ||= self.related_notes.
D
Douwe Maan 已提交
479
      inc_relations_for_view.
480 481 482 483
      fresh.
      discussions
  end

484 485 486 487
  def diff_discussions
    @diff_discussions ||= self.notes.diff_notes.discussions
  end

488 489 490 491 492 493 494 495
  def resolvable_discussions
    @resolvable_discussions ||= diff_discussions.select(&:to_be_resolved?)
  end

  def discussions_can_be_resolved_by?(user)
    resolvable_discussions.all? { |discussion| discussion.can_resolve?(user) }
  end

496 497 498 499 500
  def find_diff_discussion(discussion_id)
    notes = self.notes.diff_notes.where(discussion_id: discussion_id).fresh.to_a
    return if notes.empty?

    Discussion.new(notes)
501 502
  end

503
  def discussions_resolvable?
504
    diff_discussions.any?(&:resolvable?)
505 506
  end

507
  def discussions_resolved?
508
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
509 510
  end

511 512 513 514
  def discussions_to_be_resolved?
    discussions_resolvable? && !discussions_resolved?
  end

515 516 517
  def mergeable_discussions_state?
    return true unless project.only_allow_merge_if_all_discussions_are_resolved?

518
    !discussions_to_be_resolved?
519 520
  end

K
Kirill Zaitsev 已提交
521 522
  def hook_attrs
    attrs = {
523
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
524
      target: target_project.hook_attrs,
525 526
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
527 528
    }

529 530
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
531 532 533 534 535
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
536 537 538 539
  def for_fork?
    target_project != source_project
  end

540 541 542 543
  def project
    target_project
  end

544 545 546 547
  # If the merge request closes any issues, save this information in the
  # `MergeRequestsClosingIssues` model. This is a performance optimization.
  # Calculating this information for a number of merge requests requires
  # running `ReferenceExtractor` on each of them separately.
548
  # This optimization does not apply to issues from external sources.
549
  def cache_merge_request_closes_issues!(current_user = self.author)
550 551
    return if project.has_external_issue_tracker?

552
    transaction do
553
      self.merge_requests_closing_issues.delete_all
554

555
      closes_issues(current_user).each do |issue|
556
        self.merge_requests_closing_issues.create!(issue: issue)
557 558 559 560
      end
    end
  end

561 562 563 564
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

565
  # Return the set of issues that will be closed if this merge request is accepted.
566
  def closes_issues(current_user = self.author)
567
    if target_branch == project.default_branch
568 569
      messages = [description]
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
570 571 572

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
573 574 575 576 577
    else
      []
    end
  end

578
  def issues_mentioned_but_not_closing(current_user = self.author)
579
    return [] unless target_branch == project.default_branch
580

581 582
    ext = Gitlab::ReferenceExtractor.new(project, current_user)
    ext.analyze(description)
583

584
    ext.issues - closes_issues
585 586
  end

587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602
  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

603 604 605 606 607 608 609 610
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

611 612 613 614 615 616 617 618
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

619 620 621 622 623 624 625 626 627 628 629 630
  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

631
  def merge_commit_message(include_description: false)
632 633 634 635
    closes_issues_references = closes_issues.map do |issue|
      issue.to_reference(target_project)
    end

636 637 638 639
    message = [
      "Merge branch '#{source_branch}' into '#{target_branch}'",
      title
    ]
640

641
    if !include_description && closes_issues_references.present?
642
      message << "Closes #{closes_issues_references.to_sentence}"
643 644
    end

645
    message << "#{description}" if include_description && description.present?
646 647
    message << "See merge request #{to_reference}"

648
    message.join("\n\n")
649
  end
650

Z
Zeger-Jan van de Weg 已提交
651 652
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
653

Z
Zeger-Jan van de Weg 已提交
654 655
    self.merge_when_build_succeeds = false
    self.merge_user = nil
656 657 658 659
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
660 661 662 663

    self.save
  end

664
  # Return array of possible target branches
S
Steven Burgart 已提交
665
  # depends on target project of MR
666 667 668 669 670 671 672 673 674
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
675
  # depends on source project of MR
676 677 678 679 680 681 682
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
683 684

  def locked_long_ago?
B
Ben Bodenmiller 已提交
685 686 687
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
688
  end
689 690

  def has_ci?
691
    source_project.try(:ci_service) && commits.any?
692 693 694 695 696
  end

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

698
  def broken?
699
    has_no_commits? || branch_missing? || cannot_be_merged?
700 701
  end

702
  def can_be_merged_by?(user)
703 704 705 706 707 708 709
    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)
710 711
  end

712 713
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
714

715
    !head_pipeline || head_pipeline.success? || head_pipeline.skipped?
716 717
  end

718
  def environments
719
    return [] unless diff_head_commit
720

721 722
    @environments ||= begin
      target_envs = target_project.environments_for(
723
        ref: target_branch, commit: diff_head_commit, with_tags: true)
724 725

      source_envs = source_project.environments_for(
726
        ref: source_branch, commit: diff_head_commit) if source_project
727 728 729

      (target_envs.to_a + source_envs.to_a).uniq
    end
730 731
  end

732 733 734 735 736 737 738 739 740
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
741

742 743 744 745 746 747 748 749 750 751
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

752 753 754 755
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
756
      ref_path
757 758 759
    )
  end

760 761 762 763
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

764 765
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
766 767 768
  end

  def ensure_ref_fetched
769
    fetch_ref unless ref_fetched?
770 771
  end

772 773 774 775 776 777 778 779
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
780

781 782 783
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

784
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
785
      cache = {
786 787
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
788 789 790 791 792 793 794 795 796
        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
797
    return 0 unless source_branch_sha && target_branch_sha
798

799
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
800
  end
801
  private :compute_diverged_commits_count
802 803 804 805 806

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

807
  def head_pipeline
808
    return unless diff_head_sha && source_project
809

810
    @head_pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
811
  end
812

813
  def all_pipelines
814
    return Ci::Pipeline.none unless source_project
815

816
    @all_pipelines ||= source_project.pipelines
817 818
      .where(sha: all_commits_sha, ref: source_branch)
      .order(id: :desc)
819
  end
820

821
  # Note that this could also return SHA from now dangling commits
822
  #
823
  def all_commits_sha
824 825
    if persisted?
      merge_request_diffs.flat_map(&:commits_sha).uniq
826 827
    elsif compare_commits
      compare_commits.to_a.reverse.map(&:id)
828
    else
829
      [diff_head_sha]
830
    end
831 832
  end

833 834 835 836
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

837
  def can_be_reverted?(current_user)
838
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
839
  end
840 841 842 843

  def can_be_cherry_picked?
    merge_commit
  end
844

845
  def has_complete_diff_refs?
846
    diff_sha_refs && diff_sha_refs.complete?
847 848
  end

849
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
850
    return unless has_complete_diff_refs?
851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868
    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
    )

V
Valery Sizov 已提交
869 870 871 872 873
    transaction do
      active_diff_notes.each do |note|
        service.execute(note)
        Gitlab::Timeless.timeless(note, &:save)
      end
874 875 876
    end
  end

877 878 879
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
880 881 882 883 884

  def conflicts
    @conflicts ||= Gitlab::Conflict::FileCollection.new(self)
  end

885 886 887 888 889
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

890 891 892 893 894
  def conflicts_can_be_resolved_in_ui?
    return @conflicts_can_be_resolved_in_ui if defined?(@conflicts_can_be_resolved_in_ui)

    return @conflicts_can_be_resolved_in_ui = false unless cannot_be_merged?
    return @conflicts_can_be_resolved_in_ui = false unless has_complete_diff_refs?
895 896

    begin
897 898 899 900 901
      # Try to parse each conflict. If the MR's mergeable status hasn't been updated,
      # ensure that we don't say there are conflicts to resolve when there are no conflict
      # files.
      conflicts.files.each(&:lines)
      @conflicts_can_be_resolved_in_ui = conflicts.files.length > 0
902
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing
903
      @conflicts_can_be_resolved_in_ui = false
904 905
    end
  end
906 907

  def has_commits?
908
    merge_request_diff && commits_count > 0
909 910 911 912 913
  end

  def has_no_commits?
    !has_commits?
  end
914 915 916 917 918 919 920 921 922 923 924 925

  def mergeable_with_slash_command?(current_user, autocomplete_precheck: false, last_diff_sha: nil)
    return false unless can_be_merged_by?(current_user)

    return true if autocomplete_precheck

    return false unless mergeable?(skip_ci_check: true)
    return false if head_pipeline && !(head_pipeline.success? || head_pipeline.active?)
    return false if last_diff_sha != diff_head_sha

    true
  end
D
Dmitriy Zaporozhets 已提交
926
end