merge_request.rb 22.3 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 21
  has_many :issues_closed, through: :merge_requests_closing_issues, source: :issue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

117 118
  after_save :keep_around_commit

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

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

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

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

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

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

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

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

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

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

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

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 245
  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 已提交
246
    source_project.repository.commit(source_branch_ref) if source_branch_ref
247 248 249 250
  end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    !source_project.forked_from?(target_project)
331 332
  end

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

    closed?
K
Katarzyna Kobierska 已提交
337 338
  end

339 340
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
341 342
  end

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

  def reload_merge_request_diff
    merge_request_diff(true)
  end

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

358
  def reload_diff
359 360
    return unless open?

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

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

372
  def check_if_can_be_merged
373 374
    return unless unchecked?

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

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

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

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

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

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

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

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

    check_if_can_be_merged

    can_be_merged?
409 410
  end

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

    true
418 419
  end

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

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

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

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

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

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

465 466 467 468 469 470 471 472 473
  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)
474 475
  end

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

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

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

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

    attributes.merge!(attrs)
  end

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

503 504 505 506
  def project
    target_project
  end

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

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

524
  # Return the set of issues that will be closed if this merge request is accepted.
525
  def closes_issues(current_user = self.author)
526
    if target_branch == project.default_branch
T
Timothy Andrew 已提交
527 528 529 530 531
      messages = if merge_request_diff
                   commits.map(&:safe_message) << description
                 else
                   [description]
                 end
532 533 534

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
535 536 537 538 539
    else
      []
    end
  end

540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555
  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

556 557 558 559 560 561 562 563
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

564 565 566 567 568 569 570 571
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

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

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

Z
Zeger-Jan van de Weg 已提交
607 608
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
609

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

    self.save
  end

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

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

  def locked_long_ago?
B
Ben Bodenmiller 已提交
641 642 643
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
644
  end
645 646 647 648 649 650 651 652

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

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

654 655 656 657
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

658
  def can_be_merged_by?(user)
659 660 661 662 663 664 665
    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)
666 667
  end

668 669
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
670

R
Rémy Coutable 已提交
671
    !pipeline || pipeline.success?
672 673
  end

674
  def environments
675
    return [] unless diff_head_commit
676

677
    target_project.environments.select do |environment|
678
      environment.includes_commit?(diff_head_commit)
679 680 681
    end
  end

682 683 684 685 686 687 688 689 690
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
691

692 693 694 695 696 697 698 699 700 701
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

702 703 704 705
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
706
      ref_path
707 708 709
    )
  end

710 711 712 713
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

714 715
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
716 717 718
  end

  def ensure_ref_fetched
719
    fetch_ref unless ref_fetched?
720 721
  end

722 723 724 725 726 727 728 729
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
730

731 732 733
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

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

749
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
750
  end
751
  private :compute_diverged_commits_count
752 753 754 755 756

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

757 758 759 760
  def commits_sha
    commits.map(&:sha)
  end

761
  def pipeline
762
    return unless diff_head_sha && source_project
763

764
    @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
765
  end
766

767 768 769 770 771 772 773
  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

774 775 776 777
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

778 779
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
780
  end
781 782 783 784

  def can_be_cherry_picked?
    merge_commit
  end
785

786
  def has_complete_diff_refs?
787
    diff_sha_refs && diff_sha_refs.complete?
788 789
  end

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

816 817 818
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
819 820 821 822 823

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

824 825 826 827 828
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

829 830 831 832 833
  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?
834 835

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