merge_request.rb 23.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 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
  end
95

96
  validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
A
Andrey Kumanyaev 已提交
97
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
98
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
99
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
100
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
101 102
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
D
Dmitriy Zaporozhets 已提交
103

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

115 116 117
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

118 119
  after_save :keep_around_commit

120 121 122 123
  def self.reference_prefix
    '!'
  end

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

134
  def self.link_reference_pattern
135
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
136 137
  end

138 139 140 141
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

142 143 144 145
  def self.project_foreign_key
    'target_project_id'
  end

146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
  # 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 已提交
164 165 166 167 168 169 170 171 172 173 174 175 176 177
  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

178 179 180
  def to_reference(from_project = nil)
    reference = "#{self.class.reference_prefix}#{iid}"

181
    "#{project.to_reference(from_project)}#{reference}"
182 183
  end

184 185
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
186
  end
187

188
  def raw_diffs(*args)
189
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
190 191
  end

192
  def diffs(diff_options = nil)
193 194
    if compare
      compare.diffs(diff_options)
195
    else
196
      merge_request_diff.diffs(diff_options)
197
    end
S
Sean McGivern 已提交
198 199
  end

J
Jacob Vosmaer 已提交
200
  def diff_size
201
    diffs(diff_options).size
J
Jacob Vosmaer 已提交
202 203
  end

204
  def diff_base_commit
205
    if persisted?
206
      merge_request_diff.base_commit
207 208
    else
      branch_merge_base_commit
209 210 211 212 213 214 215 216 217
    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 已提交
218 219 220
  # 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.
221 222 223 224 225 226 227 228 229
  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
230 231 232
    end
  end

233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260
  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 已提交
261
    source_project.repository.commit(source_branch_ref) if source_branch_ref
262 263 264 265
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
266
    target_project.repository.commit(target_branch_ref) if target_branch_ref
267 268
  end

269 270 271 272 273 274 275 276 277
  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

278
  def target_branch_sha
279
    @target_branch_sha || target_branch_head.try(:sha)
280 281 282
  end

  def source_branch_sha
283
    @source_branch_sha || source_branch_head.try(:sha)
284 285
  end

286 287 288 289 290 291 292 293
  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
    )
294 295
  end

296 297
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
298
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
299
      merge_request_diff.diff_refs
300
    else
301
      diff_refs
302
    end
303 304
  end

305 306 307 308
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

309
  def validate_branches
310
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
311
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
312
    end
313

314
    if opened? || reopened?
315
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
316 317
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
318
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
319
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
320
      end
321
    end
322 323
  end

324
  def validate_fork
325
    return true unless target_project && source_project
326
    return true if target_project == source_project
327
    return true unless source_project_missing?
328

329
    errors.add :validate_fork,
330
               'Source project is not a fork of the target project'
331 332 333
  end

  def closed_without_fork?
334
    closed? && source_project_missing?
335 336
  end

337
  def source_project_missing?
338 339 340 341
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
342 343
  end

344
  def reopenable?
345
    closed? && !source_project_missing? && source_branch_exists?
K
Katarzyna Kobierska 已提交
346 347
  end

348 349
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
350 351
  end

352 353 354 355 356 357 358 359 360
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

361
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
362
    if source_branch_changed? || target_branch_changed?
363
      reload_diff
D
Dmitriy Zaporozhets 已提交
364 365 366
    end
  end

367
  def reload_diff
368 369
    return unless open?

370
    old_diff_refs = self.diff_refs
371
    create_merge_request_diff
372
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
373 374 375 376 377 378
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
379 380
  end

381
  def check_if_can_be_merged
382 383
    return unless unchecked?

384
    can_be_merged =
385
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
386 387

    if can_be_merged
388 389 390 391
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
392 393
  end

D
Dmitriy Zaporozhets 已提交
394
  def merge_event
395
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
396 397
  end

398
  def closed_event
399
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
400 401
  end

402
  def work_in_progress?
T
Thomas Balthazar 已提交
403
    self.class.work_in_progress?(title)
404 405 406
  end

  def wipless_title
T
Thomas Balthazar 已提交
407 408 409 410 411
    self.class.wipless_title(self.title)
  end

  def wip_title
    self.class.wip_title(self.title)
412 413
  end

414 415
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
416 417 418 419

    check_if_can_be_merged

    can_be_merged?
420 421
  end

422
  def mergeable_state?(skip_ci_check: false)
423 424 425
    return false unless open?
    return false if work_in_progress?
    return false if broken?
426
    return false unless skip_ci_check || mergeable_ci_state?
427
    return false unless mergeable_discussions_state?
428 429

    true
430 431
  end

432 433
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
434 435
  end

436 437 438
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
439
      Ability.allowed?(current_user, :push_code, source_project) &&
440
      diff_head_commit == source_branch_head
441 442
  end

443
  def should_remove_source_branch?
444
    Gitlab::Utils.to_boolean(merge_params['should_remove_source_branch'])
445 446 447
  end

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

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

455
  def related_notes
456 457 458 459
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

460 461
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
462
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
463
      mr_id: id,
464 465 466
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
467
    )
468
  end
469

470
  def discussions
471
    @discussions ||= self.related_notes.
D
Douwe Maan 已提交
472
      inc_relations_for_view.
473 474 475 476
      fresh.
      discussions
  end

477 478 479 480
  def diff_discussions
    @diff_discussions ||= self.notes.diff_notes.discussions
  end

481 482 483 484 485 486 487 488
  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

489 490 491 492 493
  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)
494 495
  end

496
  def discussions_resolvable?
497
    diff_discussions.any?(&:resolvable?)
498 499
  end

500
  def discussions_resolved?
501
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
502 503
  end

504 505 506 507
  def discussions_to_be_resolved?
    discussions_resolvable? && !discussions_resolved?
  end

508 509 510
  def mergeable_discussions_state?
    return true unless project.only_allow_merge_if_all_discussions_are_resolved?

511
    !discussions_to_be_resolved?
512 513
  end

K
Kirill Zaitsev 已提交
514 515
  def hook_attrs
    attrs = {
516
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
517
      target: target_project.hook_attrs,
518 519
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
520 521
    }

522 523
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
524 525 526 527 528
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
529 530 531 532
  def for_fork?
    target_project != source_project
  end

533 534 535 536
  def project
    target_project
  end

537 538 539 540
  # 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.
541
  # This optimization does not apply to issues from external sources.
542
  def cache_merge_request_closes_issues!(current_user = self.author)
543 544
    return if project.has_external_issue_tracker?

545
    transaction do
546
      self.merge_requests_closing_issues.delete_all
547

548
      closes_issues(current_user).each do |issue|
549
        self.merge_requests_closing_issues.create!(issue: issue)
550 551 552 553
      end
    end
  end

554 555 556 557
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

558
  # Return the set of issues that will be closed if this merge request is accepted.
559
  def closes_issues(current_user = self.author)
560
    if target_branch == project.default_branch
561 562
      messages = [description]
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
563 564 565

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
566 567 568 569 570
    else
      []
    end
  end

571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586
  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

587 588 589 590 591 592 593 594
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

595 596 597 598 599 600 601 602
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

603 604 605 606 607 608 609 610 611 612 613 614
  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

615
  def merge_commit_message
616 617 618 619 620
    message = "Merge branch '#{source_branch}' into '#{target_branch}'\n\n"
    message << "#{title}\n\n"
    message << "#{description}\n\n" if description.present?
    message << "See merge request #{to_reference}"

D
Dmitriy Zaporozhets 已提交
621
    message
622
  end
623

Z
Zeger-Jan van de Weg 已提交
624 625
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
626

Z
Zeger-Jan van de Weg 已提交
627 628
    self.merge_when_build_succeeds = false
    self.merge_user = nil
629 630 631 632
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
633 634 635 636

    self.save
  end

637
  # Return array of possible target branches
S
Steven Burgart 已提交
638
  # depends on target project of MR
639 640 641 642 643 644 645 646 647
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
648
  # depends on source project of MR
649 650 651 652 653 654 655
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
656 657

  def locked_long_ago?
B
Ben Bodenmiller 已提交
658 659 660
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
661
  end
662 663

  def has_ci?
664
    source_project.try(:ci_service) && commits.any?
665 666 667 668 669
  end

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

671
  def broken?
672
    has_no_commits? || branch_missing? || cannot_be_merged?
673 674
  end

675
  def can_be_merged_by?(user)
676 677 678 679 680 681 682
    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)
683 684
  end

685 686
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
687

688
    !head_pipeline || head_pipeline.success? || head_pipeline.skipped?
689 690
  end

691
  def environments
692
    return [] unless diff_head_commit
693

694 695 696 697 698 699 700 701 702
    @environments ||= begin
      target_envs = target_project.environments_for(
        target_branch, commit: diff_head_commit, with_tags: true)

      source_envs = source_project.environments_for(
        source_branch, commit: diff_head_commit) if source_project

      (target_envs.to_a + source_envs.to_a).uniq
    end
703 704
  end

705 706 707 708 709 710 711 712 713
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
714

715 716 717 718 719 720 721 722 723 724
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

725 726 727 728
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
729
      ref_path
730 731 732
    )
  end

733 734 735 736
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

737 738
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
739 740 741
  end

  def ensure_ref_fetched
742
    fetch_ref unless ref_fetched?
743 744
  end

745 746 747 748 749 750 751 752
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
753

754 755 756
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

757
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
758
      cache = {
759 760
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
761 762 763 764 765 766 767 768 769
        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
770
    return 0 unless source_branch_sha && target_branch_sha
771

772
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
773
  end
774
  private :compute_diverged_commits_count
775 776 777 778 779

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

780
  def head_pipeline
781
    return unless diff_head_sha && source_project
782

783
    @head_pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
784
  end
785

786
  def all_pipelines
787
    return Ci::Pipeline.none unless source_project
788

789
    @all_pipelines ||= source_project.pipelines
790 791
      .where(sha: all_commits_sha, ref: source_branch)
      .order(id: :desc)
792
  end
793

794
  # Note that this could also return SHA from now dangling commits
795
  #
796
  def all_commits_sha
797 798
    if persisted?
      merge_request_diffs.flat_map(&:commits_sha).uniq
799 800
    elsif compare_commits
      compare_commits.to_a.reverse.map(&:id)
801
    else
802
      [diff_head_sha]
803
    end
804 805
  end

806 807 808 809
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

810
  def can_be_reverted?(current_user)
811
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
812
  end
813 814 815 816

  def can_be_cherry_picked?
    merge_commit
  end
817

818
  def has_complete_diff_refs?
819
    diff_sha_refs && diff_sha_refs.complete?
820 821
  end

822
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
823
    return unless has_complete_diff_refs?
824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847
    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

848 849 850
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
851 852 853 854 855

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

856 857 858 859 860
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

861 862 863 864 865
  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?
866 867

    begin
868 869 870 871 872
      # 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
873
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing
874
      @conflicts_can_be_resolved_in_ui = false
875 876
    end
  end
877 878 879 880 881 882 883 884

  def has_commits?
    commits_count > 0
  end

  def has_no_commits?
    !has_commits?
  end
D
Dmitriy Zaporozhets 已提交
885
end