merge_request.rb 23.1 KB
Newer Older
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
1
class MergeRequest < ActiveRecord::Base
2
  include InternalId
3
  include Issuable
4
5
  include Referable
  include Sortable
6
  include Importable
7

8
9
  belongs_to :target_project, class_name: "Project"
  belongs_to :source_project, class_name: "Project"
10
  belongs_to :merge_user, class_name: "User"
11

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

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

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

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
  delegate :commits, :real_size, to: :merge_request_diff, prefix: nil
26

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
27
28
29
30
  # When this attribute is true some MR validation is ignored
  # It allows us to close or modify broken merge requests
  attr_accessor :allow_broken

31
32
  # Temporary fields to store compare vars
  # when creating new merge request
33
  attr_accessor :can_be_created, :compare_commits, :diff_options, :compare
34

Andrew8xx8's avatar
Andrew8xx8 committed
35
  state_machine :state, initial: :opened do
36
37
38
39
    event :close do
      transition [:reopened, :opened] => :closed
    end

40
    event :mark_as_merged do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
41
      transition [:reopened, :opened, :locked] => :merged
42
43
44
    end

    event :reopen do
Andrew8xx8's avatar
Andrew8xx8 committed
45
      transition closed: :reopened
46
47
    end

48
    event :lock_mr do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
49
50
51
      transition [:reopened, :opened] => :locked
    end

52
    event :unlock_mr do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
53
54
55
      transition locked: :reopened
    end

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

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

66
67
68
69
    state :opened
    state :reopened
    state :closed
    state :merged
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
70
    state :locked
71
72
  end

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

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

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

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

95
  validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
Andrey Kumanyaev's avatar
Andrey Kumanyaev committed
96
  validates :source_branch, presence: true
97
  validates :target_project, presence: true
Andrey Kumanyaev's avatar
Andrey Kumanyaev committed
98
  validates :target_branch, presence: true
Zeger-Jan van de Weg's avatar
Zeger-Jan van de Weg committed
99
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
100
101
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
102

103
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
104
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
105
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
106
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
107
  scope :from_project, ->(project) { where(source_project_id: project.id) }
108
109
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
110
  scope :from_source_branches, ->(branches) { where(source_branch: branches) }
111

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

115
116
  after_save :keep_around_commit

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

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

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

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

139
140
141
142
  def self.project_foreign_key
    'target_project_id'
  end

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

Thomas Balthazar's avatar
Thomas Balthazar committed
161
162
163
164
165
166
167
168
169
170
171
172
173
174
  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

175
176
177
178
179
180
181
182
183
184
  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

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

189
  def raw_diffs(*args)
190
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
191
192
  end

193
  def diffs(diff_options = nil)
194
195
    if compare
      compare.diffs(diff_options)
196
    else
197
      merge_request_diff.diffs(diff_options)
198
    end
199
200
  end

201
  def diff_size
202
    diffs(diff_options).size
203
204
  end

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

  def diff_head_commit
235
    if persisted?diff_head_commit
236
237
238
      merge_request_diff.head_commit
    else
      source_branch_head
239
240
241
    end
  end

242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
  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
262
    source_project.repository.commit(source_branch_ref) if source_branch_ref
263
264
265
266
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
267
    target_project.repository.commit(target_branch_ref) if target_branch_ref
268
269
  end

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

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

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

287
  def diff_refs
288
    return unless diff_start_commit || diff_base_commit
289
290
291
292
293
294
295
296

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

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

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

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

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

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

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

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

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

    !source_project.forked_from?(target_project)
343
344
  end

345
  def reopenable?
346
    closed? && !source_project_missing? && source_branch_exists?
Katarzyna Kobierska's avatar
Katarzyna Kobierska committed
347
348
  end

349
350
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
351
352
  end

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

  def reload_merge_request_diff
    merge_request_diff(true)
  end

362
  def reload_diff_if_branch_changed
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
363
    if source_branch_changed? || target_branch_changed?
364
      reload_diff
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
365
366
367
    end
  end

368
  def reload_diff
369
    return unless open?
370
371

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

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

382
  def check_if_can_be_merged
383
384
    return unless unchecked?

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

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

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
395
  def merge_event
396
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
397
398
  end

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

403
  def work_in_progress?
Thomas Balthazar's avatar
Thomas Balthazar committed
404
    self.class.work_in_progress?(title)
405
406
407
  end

  def wipless_title
Thomas Balthazar's avatar
Thomas Balthazar committed
408
409
410
411
412
    self.class.wipless_title(self.title)
  end

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

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

    check_if_can_be_merged
419
420

    can_be_merged?
421
422
  end

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

    true
  end

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

437
438
439
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
http://jneen.net/'s avatar
http://jneen.net/ committed
440
      Ability.allowed?(current_user, :push_code, source_project) &&
441
      diff_head_commit == source_branch_head
442
443
  end

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

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

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

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

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

471
  def discussions
472
    @discussions ||= self.mr_and_commit_notes.
473
      inc_relations_for_view.
474
475
476
477
      fresh.
      discussions
  end

478
479
480
481
482
483
484
485
486
  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)
487
488
  end

489
  def discussions_resolvable?
490
    diff_discussions.any?(&:resolvable?)
491
492
  end

493
  def discussions_resolved?
494
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
495
496
  end

497
498
499
500
501
502
  def mergeable_discussions_state?
    return true unless project.only_allow_merge_if_all_discussions_are_resolved?

    discussions_resolved?
  end

Kirill Zaitsev's avatar
Kirill Zaitsev committed
503
504
  def hook_attrs
    attrs = {
505
506
      source: source_project.try(:hook_attrs),
      target: target_project.hook_attrs,
507
508
      last_commit: nil,
      work_in_progress: work_in_progress?
Kirill Zaitsev's avatar
Kirill Zaitsev committed
509
510
    }

511
512
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
Kirill Zaitsev's avatar
Kirill Zaitsev committed
513
514
515
516
517
    end

    attributes.merge!(attrs)
  end

518
519
520
521
  def for_fork?
    target_project != source_project
  end

522
523
524
525
  def project
    target_project
  end

526
527
528
529
  # 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.
530
  # This optimization does not apply to issues from external sources.
531
  def cache_merge_request_closes_issues!(current_user = self.author)
532
533
    return if project.has_external_issue_tracker?

534
    transaction do
535
      self.merge_requests_closing_issues.delete_all
536

537
      closes_issues(current_user).each do |issue|
538
        self.merge_requests_closing_issues.create!(issue: issue)
539
540
541
542
      end
    end
  end

543
544
545
546
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

547
  # Return the set of issues that will be closed if this merge request is accepted.
548
  def closes_issues(current_user = self.author)
549
    if target_branch == project.default_branch
550
551
      messages = [description]
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
552
553
554

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
555
556
557
558
559
    else
      []
    end
  end

560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
  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

576
577
578
579
580
581
582
583
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

584
585
586
587
588
589
590
591
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

592
593
594
595
596
597
598
599
600
601
602
603
  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

Drew Blessing's avatar
Drew Blessing committed
604
605
606
607
608
609
610
611
612
  # 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
613
    Event.reset_event_cache_for(self)
Drew Blessing's avatar
Drew Blessing committed
614
615
  end

616
  def merge_commit_message
617
618
619
620
621
    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}"

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
622
    message
623
  end
624

625
626
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
627

628
629
    self.merge_when_build_succeeds = false
    self.merge_user = nil
630
631
632
633
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
634
635
636
637

    self.save
  end

638
  # Return array of possible target branches
Steven Burgart's avatar
Steven Burgart committed
639
  # depends on target project of MR
640
641
642
643
644
645
646
647
648
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
Steven Burgart's avatar
Steven Burgart committed
649
  # depends on source project of MR
650
651
652
653
654
655
656
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
657
658

  def locked_long_ago?
Ben Bodenmiller's avatar
Ben Bodenmiller committed
659
660
661
    return false unless locked?

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

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

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

672
673
674
675
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

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

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

Rémy Coutable's avatar
Rémy Coutable committed
689
    !pipeline || pipeline.success?
690
691
  end

692
  def environments
693
    return [] unless diff_head_commit
694

695
696
    @environments ||=
      begin
697
698
699
        envs = target_project.environments_for(target_branch, diff_head_commit, with_tags: true)
        envs.concat(source_project.environments_for(source_branch, diff_head_commit)) if source_project
        envs.uniq
700
      end
701
702
  end

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

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

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

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

735
736
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
737
738
739
  end

  def ensure_ref_fetched
740
    fetch_ref unless ref_fetched?
741
742
  end

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

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

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

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

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

778
779
780
781
  def commits_sha
    commits.map(&:sha)
  end

782
  def pipeline
783
    return unless diff_head_sha && source_project
784

785
    @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
786
  end
787

788
  def all_pipelines
789
790
    return unless source_project

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

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

808
809
810
811
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

812
813
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
814
  end
815
816
817
818

  def can_be_cherry_picked?
    merge_commit
  end
819

820
  def has_complete_diff_refs?
821
    diff_sha_refs && diff_sha_refs.complete?
822
823
  end

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

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

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

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

863
864
865
866
867
  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?
868
869

    begin
870
871
872
873
874
      # 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
875
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing
876
      @conflicts_can_be_resolved_in_ui = false
877
878
    end
  end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
879
end