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
  has_one :merge_request_diff,
    -> { order('merge_request_diffs.id DESC') }
16
  has_one :metrics, dependent: :destroy
17

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

20 21 22
  has_many :merge_requests_closing_issues, class_name: MergeRequestsClosingIssues
  has_many :issues_closed, through: :merge_requests_closing_issues, source: :issue

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

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

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

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

38 39
  after_save :record_metrics

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

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

    event :reopen do
A
Andrew8xx8 已提交
50
      transition closed: :reopened
A
Andrew8xx8 已提交
51 52
    end

53
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
54 55 56
      transition [:reopened, :opened] => :locked
    end

57
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
58 59 60
      transition locked: :reopened
    end

61 62 63 64 65
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

66
    after_transition locked: (any - :locked) do |merge_request, transition|
67 68 69 70
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
71 72 73 74
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
75
    state :locked
A
Andrew8xx8 已提交
76 77
  end

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

    event :mark_as_unmergeable do
88
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
89 90
    end

91
    state :unchecked
92 93
    state :can_be_merged
    state :cannot_be_merged
94 95

    around_transition do |merge_request, transition, block|
96
      Gitlab::Timeless.timeless(merge_request, &block)
97
    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
Z
Zeger-Jan van de Weg 已提交
104
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
105 106
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
D
Dmitriy Zaporozhets 已提交
107

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

117 118 119
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

120 121
  after_save :keep_around_commit

122 123 124 125
  def self.reference_prefix
    '!'
  end

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

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

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

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

162 163 164 165 166 167 168 169 170 171
  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

172 173
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
174
  end
175

176
  def raw_diffs(*args)
177
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
178 179
  end

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

J
Jacob Vosmaer 已提交
188 189 190 191
  def diff_size
    merge_request_diff.size
  end

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

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

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
254
    target_project.repository.commit(target_branch_ref) if target_branch_ref
255 256
  end

257 258 259 260 261 262 263 264 265
  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

266
  def target_branch_sha
267
    @target_branch_sha || target_branch_head.try(:sha)
268 269 270
  end

  def source_branch_sha
271
    @source_branch_sha || source_branch_head.try(:sha)
272 273
  end

274 275 276 277 278 279 280 281
  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
    )
282 283
  end

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

293 294 295 296
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

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

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

312
  def validate_fork
313
    return true unless target_project && source_project
314
    return true if target_project == source_project
K
Katarzyna Kobierska 已提交
315
    return true unless forked_source_project_missing?
316

317
    errors.add :validate_fork,
318
               'Source project is not a fork of the target project'
319 320 321
  end

  def closed_without_fork?
K
Katarzyna Kobierska 已提交
322
    closed? && forked_source_project_missing?
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 333
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
334 335
  end

336 337 338 339 340 341 342 343 344
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

345
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
346
    if source_branch_changed? || target_branch_changed?
347
      reload_diff
D
Dmitriy Zaporozhets 已提交
348 349 350
    end
  end

351
  def reload_diff
352 353
    return unless open?

354
    old_diff_refs = self.diff_refs
355
    create_merge_request_diff
356
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
357 358 359 360 361 362
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
363 364
  end

365
  def check_if_can_be_merged
366 367
    return unless unchecked?

368
    can_be_merged =
369
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
370 371

    if can_be_merged
372 373 374 375
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
376 377
  end

D
Dmitriy Zaporozhets 已提交
378
  def merge_event
379
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
380 381
  end

382
  def closed_event
383
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
384 385
  end

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

388
  def work_in_progress?
389
    !!(title =~ WIP_REGEX)
390 391 392 393
  end

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

396 397
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
398 399 400 401

    check_if_can_be_merged

    can_be_merged?
402 403
  end

404
  def mergeable_state?(skip_ci_check: false)
405 406 407
    return false unless open?
    return false if work_in_progress?
    return false if broken?
408
    return false unless skip_ci_check || mergeable_ci_state?
409 410

    true
411 412
  end

413 414
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
415 416
  end

417 418 419
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
420
      Ability.allowed?(current_user, :push_code, source_project) &&
421
      diff_head_commit == source_branch_head
422 423
  end

424 425 426 427 428 429 430 431 432 433 434 435
  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

436
  def mr_and_commit_notes
437 438 439 440
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

441 442
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
443
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
444
      mr_id: id,
445 446 447
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
448
    )
449
  end
450

451
  def discussions
452
    @discussions ||= self.mr_and_commit_notes.
D
Douwe Maan 已提交
453
      inc_relations_for_view.
454 455 456 457
      fresh.
      discussions
  end

458 459 460 461 462 463 464 465 466
  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)
467 468
  end

469
  def discussions_resolvable?
470
    diff_discussions.any?(&:resolvable?)
471 472
  end

473
  def discussions_resolved?
474
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
475 476
  end

K
Kirill Zaitsev 已提交
477 478
  def hook_attrs
    attrs = {
479
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
480
      target: target_project.hook_attrs,
481 482
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
483 484
    }

485 486
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
487 488 489 490 491
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
492 493 494 495
  def for_fork?
    target_project != source_project
  end

496 497 498 499
  def project
    target_project
  end

500 501 502 503 504 505 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
      closes_issues(current_user).each do |issue|
        MergeRequestsClosingIssues.create!(merge_request: self, issue: issue)
      end
    end
  end

512 513 514 515
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

516
  # Return the set of issues that will be closed if this merge request is accepted.
517
  def closes_issues(current_user = self.author)
518
    if target_branch == project.default_branch
519 520 521 522
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
523 524 525 526 527
    else
      []
    end
  end

528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543
  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

544 545 546 547 548 549 550 551
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

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

560 561 562 563 564 565 566 567 568 569 570 571
  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 已提交
572 573 574 575 576 577 578 579 580
  # 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
581
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
582 583
  end

584 585 586
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
587
    message << title.to_s
588
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
589
    message << description.to_s
590 591
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
592
    message
593
  end
594

Z
Zeger-Jan van de Weg 已提交
595 596
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
597

Z
Zeger-Jan van de Weg 已提交
598 599
    self.merge_when_build_succeeds = false
    self.merge_user = nil
600 601 602 603
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
604 605 606 607

    self.save
  end

608
  # Return array of possible target branches
S
Steven Burgart 已提交
609
  # depends on target project of MR
610 611 612 613 614 615 616 617 618
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

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

  def locked_long_ago?
B
Ben Bodenmiller 已提交
629 630 631
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
632
  end
633 634 635 636 637 638 639 640

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

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

642 643 644 645
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

646
  def can_be_merged_by?(user)
647 648 649 650 651 652 653
    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)
654 655
  end

656 657
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
658

R
Rémy Coutable 已提交
659
    !pipeline || pipeline.success?
660 661
  end

662
  def environments
663 664
    return unless diff_head_commit

665
    target_project.environments.select do |environment|
666
      environment.includes_commit?(diff_head_commit)
667 668 669
    end
  end

670 671 672 673 674 675 676 677 678
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
679

680 681 682 683 684 685 686 687 688 689
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

690 691 692 693
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
694
      ref_path
695 696 697
    )
  end

698 699 700 701
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

702 703
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
704 705 706
  end

  def ensure_ref_fetched
707
    fetch_ref unless ref_fetched?
708 709
  end

710 711 712 713 714 715 716 717
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
718

719 720 721
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

722
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
723
      cache = {
724 725
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
726 727 728 729 730 731 732 733 734
        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
735
    return 0 unless source_branch_sha && target_branch_sha
736

737
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
738
  end
739
  private :compute_diverged_commits_count
740 741 742 743 744

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

745 746 747 748
  def commits_sha
    commits.map(&:sha)
  end

749
  def pipeline
750
    return unless diff_head_sha && source_project
751

752
    @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
753
  end
754

755 756 757 758 759 760 761
  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

762 763 764 765
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

766 767
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
768
  end
769 770 771 772

  def can_be_cherry_picked?
    merge_commit
  end
773

774
  def has_complete_diff_refs?
775
    diff_sha_refs && diff_sha_refs.complete?
776 777
  end

778
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
779
    return unless has_complete_diff_refs?
780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803
    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

804 805 806
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
807 808 809 810 811

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

812 813 814 815 816
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

817 818 819 820 821
  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?
822 823

    begin
824 825 826 827 828
      # 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
829
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing
830
      @conflicts_can_be_resolved_in_ui = false
831 832
    end
  end
833 834 835 836 837

  def record_metrics
    metrics = Metrics.find_or_create_by(merge_request_id: self.id)
    metrics.record!
  end
D
Dmitriy Zaporozhets 已提交
838
end