merge_request.rb 22.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 16
  has_one :merge_request_diff,
    -> { order('merge_request_diffs.id DESC') }

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

19
  has_many :merge_requests_closing_issues, class_name:  'MergeRequestsClosingIssues'
20

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

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

S
Sean McGivern 已提交
26
  delegate :commits, :real_size, 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
J
Jacob Vosmaer 已提交
34
  attr_accessor :can_be_created, :compare_commits, :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

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

113 114 115
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

116 117
  after_save :keep_around_commit

118 119 120 121
  def self.reference_prefix
    '!'
  end

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

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

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

140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157
  # 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

158 159 160 161 162 163 164 165 166 167
  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

168 169
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
170
  end
171

172
  def raw_diffs(*args)
173
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
174 175
  end

176
  def diffs(diff_options = nil)
177 178
    if compare
      compare.diffs(diff_options)
179
    else
180
      merge_request_diff.diffs(diff_options)
181
    end
S
Sean McGivern 已提交
182 183
  end

J
Jacob Vosmaer 已提交
184 185 186 187
  def diff_size
    merge_request_diff.size
  end

188
  def diff_base_commit
189
    if persisted?
190
      merge_request_diff.base_commit
191 192
    else
      branch_merge_base_commit
193 194 195 196 197 198 199 200 201
    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 已提交
202 203 204
  # 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.
205 206 207 208 209 210 211 212 213
  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
214 215 216
    end
  end

217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
  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 已提交
245
    source_project.repository.commit(source_branch_ref) if source_branch_ref
246 247 248 249
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
250
    target_project.repository.commit(target_branch_ref) if target_branch_ref
251 252
  end

253 254 255 256 257 258 259 260 261
  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

262
  def target_branch_sha
263
    @target_branch_sha || target_branch_head.try(:sha)
264 265 266
  end

  def source_branch_sha
267
    @source_branch_sha || source_branch_head.try(:sha)
268 269
  end

270 271 272 273 274 275 276 277
  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
    )
278 279
  end

280 281
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
282
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
283
      merge_request_diff.diff_refs
284
    else
285
      diff_refs
286
    end
287 288
  end

289 290 291 292
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

293
  def validate_branches
294
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
295
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
296
    end
297

298
    if opened? || reopened?
299
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
300 301
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
302
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
303
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
304
      end
305
    end
306 307
  end

308
  def validate_fork
309
    return true unless target_project && source_project
310
    return true if target_project == source_project
K
Katarzyna Kobierska 已提交
311
    return true unless forked_source_project_missing?
312

313
    errors.add :validate_fork,
314
               'Source project is not a fork of the target project'
315 316 317
  end

  def closed_without_fork?
K
Katarzyna Kobierska 已提交
318
    closed? && forked_source_project_missing?
319 320
  end

321 322
  def closed_without_source_project?
    closed? && !source_project
323 324
  end

K
Katarzyna Kobierska 已提交
325
  def forked_source_project_missing?
326 327 328 329
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
330 331
  end

332
  def reopenable?
K
Katarzyna Kobierska 已提交
333
    return false if closed_without_fork? || closed_without_source_project? || merged?
334 335

    closed?
K
Katarzyna Kobierska 已提交
336 337
  end

338 339
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
340 341
  end

342 343 344 345 346 347 348 349 350
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

351
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
352
    if source_branch_changed? || target_branch_changed?
353
      reload_diff
D
Dmitriy Zaporozhets 已提交
354 355 356
    end
  end

357
  def reload_diff
358 359
    return unless open?

360
    old_diff_refs = self.diff_refs
361
    create_merge_request_diff
362
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
363 364 365 366 367 368
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
369 370
  end

371
  def check_if_can_be_merged
372 373
    return unless unchecked?

374
    can_be_merged =
375
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
376 377

    if can_be_merged
378 379 380 381
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
382 383
  end

D
Dmitriy Zaporozhets 已提交
384
  def merge_event
385
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
386 387
  end

388
  def closed_event
389
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
390 391
  end

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

394
  def work_in_progress?
395
    !!(title =~ WIP_REGEX)
396 397 398 399
  end

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

402 403
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
404 405 406 407

    check_if_can_be_merged

    can_be_merged?
408 409
  end

410
  def mergeable_state?(skip_ci_check: false)
411 412 413
    return false unless open?
    return false if work_in_progress?
    return false if broken?
414
    return false unless skip_ci_check || mergeable_ci_state?
415 416

    true
417 418
  end

419 420
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
421 422
  end

423 424 425
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
426
      Ability.allowed?(current_user, :push_code, source_project) &&
427
      diff_head_commit == source_branch_head
428 429
  end

430 431 432 433 434 435 436 437 438 439 440 441
  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

442
  def mr_and_commit_notes
443 444 445 446
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

447 448
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
449
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
450
      mr_id: id,
451 452 453
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
454
    )
455
  end
456

457
  def discussions
458
    @discussions ||= self.mr_and_commit_notes.
D
Douwe Maan 已提交
459
      inc_relations_for_view.
460 461 462 463
      fresh.
      discussions
  end

464 465 466 467 468 469 470 471 472
  def diff_discussions
    @diff_discussions ||= self.notes.diff_notes.discussions
  end

  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)
473 474
  end

475
  def discussions_resolvable?
476
    diff_discussions.any?(&:resolvable?)
477 478
  end

479
  def discussions_resolved?
480
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
481 482
  end

K
Kirill Zaitsev 已提交
483 484
  def hook_attrs
    attrs = {
485
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
486
      target: target_project.hook_attrs,
487 488
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
489 490
    }

491 492
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
493 494 495 496 497
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
498 499 500 501
  def for_fork?
    target_project != source_project
  end

502 503 504 505
  def project
    target_project
  end

506 507 508 509 510 511
  # 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.
  def cache_merge_request_closes_issues!(current_user = self.author)
    transaction do
512
      self.merge_requests_closing_issues.delete_all
513
      closes_issues(current_user).each do |issue|
514
        self.merge_requests_closing_issues.create!(issue: issue)
515 516 517 518
      end
    end
  end

519 520 521 522
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

523
  # Return the set of issues that will be closed if this merge request is accepted.
524
  def closes_issues(current_user = self.author)
525
    if target_branch == project.default_branch
526 527
      messages = [description]
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
528 529 530

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
531 532 533 534 535
    else
      []
    end
  end

536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551
  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

552 553 554 555 556 557 558 559
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

560 561 562 563 564 565 566 567
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

568 569 570 571 572 573 574 575 576 577 578 579
  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 已提交
580 581 582 583 584 585 586 587 588
  # 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
589
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
590 591
  end

592 593 594
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
595
    message << title.to_s
596
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
597
    message << description.to_s
598 599
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
600
    message
601
  end
602

Z
Zeger-Jan van de Weg 已提交
603 604
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
605

Z
Zeger-Jan van de Weg 已提交
606 607
    self.merge_when_build_succeeds = false
    self.merge_user = nil
608 609 610 611
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
612 613 614 615

    self.save
  end

616
  # Return array of possible target branches
S
Steven Burgart 已提交
617
  # depends on target project of MR
618 619 620 621 622 623 624 625 626
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
627
  # depends on source project of MR
628 629 630 631 632 633 634
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
635 636

  def locked_long_ago?
B
Ben Bodenmiller 已提交
637 638 639
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
640
  end
641 642 643 644 645 646 647 648

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

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

650 651 652 653
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

654
  def can_be_merged_by?(user)
655 656 657 658 659 660 661
    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)
662 663
  end

664 665
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
666

R
Rémy Coutable 已提交
667
    !pipeline || pipeline.success?
668 669
  end

670
  def environments
671
    return [] unless diff_head_commit
672

673
    target_project.environments.select do |environment|
674
      environment.includes_commit?(diff_head_commit)
675 676 677
    end
  end

678 679 680 681 682 683 684 685 686
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
687

688 689 690 691 692 693 694 695 696 697
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

698 699 700 701
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
702
      ref_path
703 704 705
    )
  end

706 707 708 709
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

710 711
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
712 713 714
  end

  def ensure_ref_fetched
715
    fetch_ref unless ref_fetched?
716 717
  end

718 719 720 721 722 723 724 725
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
726

727 728 729
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

730
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
731
      cache = {
732 733
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
734 735 736 737 738 739 740 741 742
        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
743
    return 0 unless source_branch_sha && target_branch_sha
744

745
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
746
  end
747
  private :compute_diverged_commits_count
748 749 750 751 752

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

753 754 755 756
  def commits_sha
    commits.map(&:sha)
  end

757
  def pipeline
758
    return unless diff_head_sha && source_project
759

760
    @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
761
  end
762

763 764 765 766 767 768 769
  def all_pipelines
    @all_pipelines ||=
      if diff_head_sha && source_project
        source_project.pipelines.order(id: :desc).where(sha: commits_sha, ref: source_branch)
      end
  end

770 771 772 773
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

774 775
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
776
  end
777 778 779 780

  def can_be_cherry_picked?
    merge_commit
  end
781

782
  def has_complete_diff_refs?
783
    diff_sha_refs && diff_sha_refs.complete?
784 785
  end

786
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
787
    return unless has_complete_diff_refs?
788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811
    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

812 813 814
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
815 816 817 818 819

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

820 821 822 823 824
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

825 826 827 828 829
  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?
830 831

    begin
832 833 834 835 836
      # 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
837
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing
838
      @conflicts_can_be_resolved_in_ui = false
839 840
    end
  end
D
Dmitriy Zaporozhets 已提交
841
end