merge_request.rb 15.4 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_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
14

Z
Zeger-Jan van de Weg 已提交
15 16
  serialize :merge_params, Hash

17
  after_create :create_merge_request_diff, unless: :importing
D
Dmitriy Zaporozhets 已提交
18
  after_update :update_merge_request_diff
19

J
Jacob Vosmaer 已提交
20
  delegate :commits, :diffs, :real_size, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
21

D
Dmitriy Zaporozhets 已提交
22 23 24 25
  # 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 已提交
26 27
  # Temporary fields to store compare vars
  # when creating new merge request
J
Jacob Vosmaer 已提交
28
  attr_accessor :can_be_created, :compare_commits, :compare
D
Dmitriy Zaporozhets 已提交
29

30 31 32 33
  # Temporary fields to store target_sha, and base_sha to
  # compare when importing pull requests from GitHub
  attr_accessor :base_target_sha, :head_source_sha

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

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

    event :reopen do
A
Andrew8xx8 已提交
44
      transition closed: :reopened
A
Andrew8xx8 已提交
45 46
    end

47
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
48 49 50
      transition [:reopened, :opened] => :locked
    end

51
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
52 53 54
      transition locked: :reopened
    end

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

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

A
Andrew8xx8 已提交
65 66 67 68
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
69
    state :locked
A
Andrew8xx8 已提交
70 71
  end

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

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

85
    state :unchecked
86 87
    state :can_be_merged
    state :cannot_be_merged
88 89 90 91 92 93 94 95 96

    around_transition do |merge_request, transition, block|
      merge_request.record_timestamps = false
      begin
        block.call
      ensure
        merge_request.record_timestamps = true
      end
    end
97
  end
98

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

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

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

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 last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
170
  end
171 172 173

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

J
Jacob Vosmaer 已提交
176 177 178 179
  def diff_size
    merge_request_diff.size
  end

180 181 182
  def diff_base_commit
    if merge_request_diff
      merge_request_diff.base_commit
D
Douwe Maan 已提交
183
    elsif source_sha
184
      self.target_project.merge_base_commit(self.source_sha, self.target_branch)
185 186 187
    end
  end

188 189 190 191
  def last_commit_short_sha
    last_commit.short_id
  end

192
  def validate_branches
193
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
194
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
195
    end
196

197
    if opened? || reopened?
198
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
199 200
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
201
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
202
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
203
      end
204
    end
205 206
  end

207
  def validate_fork
208 209 210
    return true unless target_project && source_project

    if target_project == source_project
211 212 213 214 215 216 217
      true
    else
      # If source and target projects are different
      # we should check if source project is actually a fork of target project
      if source_project.forked_from?(target_project)
        true
      else
J
jubianchi 已提交
218 219
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
220 221 222 223
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
224 225 226 227 228 229
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

230
  def reload_code
231
    if merge_request_diff && open?
232 233
      merge_request_diff.reload_content
    end
234 235
  end

236
  def check_if_can_be_merged
237 238
    return unless unchecked?

239
    can_be_merged =
240
      !broken? && project.repository.can_be_merged?(source_sha, target_branch)
241 242

    if can_be_merged
243 244 245 246
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
247 248
  end

D
Dmitriy Zaporozhets 已提交
249
  def merge_event
I
Izaak Alpert 已提交
250
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
251 252
  end

253
  def closed_event
I
Izaak Alpert 已提交
254
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
255 256
  end

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

259
  def work_in_progress?
260
    !!(title =~ WIP_REGEX)
261 262 263 264
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
265 266
  end

267
  def mergeable?
268
    return false unless mergeable_state?
269 270 271 272

    check_if_can_be_merged

    can_be_merged?
273 274
  end

275 276 277 278
  def mergeable_state?
    return false unless open?
    return false if work_in_progress?
    return false if broken?
279
    return false unless mergeable_ci_state?
280 281

    true
282 283
  end

284 285
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
286 287
  end

288 289 290
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
291 292
      Ability.abilities.allowed?(current_user, :push_code, source_project) &&
      last_commit == source_project.commit(source_branch)
293 294
  end

295 296 297 298 299 300 301 302 303 304 305 306
  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

307
  def mr_and_commit_notes
308 309 310 311
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

312 313
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
314
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
315
      mr_id: id,
316 317 318
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
319
    )
320
  end
321

322 323 324
  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
325
  def to_patch
326
    target_project.repository.format_patch(diff_base_commit.sha, source_sha)
327
  end
328

K
Kirill Zaitsev 已提交
329 330
  def hook_attrs
    attrs = {
331
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
332
      target: target_project.hook_attrs,
333 334
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
335 336
    }

V
Valery Sizov 已提交
337
    if last_commit
338
      attrs.merge!(last_commit: last_commit.hook_attrs)
K
Kirill Zaitsev 已提交
339 340 341 342 343
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
344 345 346 347
  def for_fork?
    target_project != source_project
  end

348 349 350 351
  def project
    target_project
  end

352 353 354 355
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

356
  # Return the set of issues that will be closed if this merge request is accepted.
357
  def closes_issues(current_user = self.author)
358
    if target_branch == project.default_branch
359 360 361 362
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
363 364 365 366 367
    else
      []
    end
  end

368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383
  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

384 385 386 387 388 389 390 391
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

392 393 394 395 396 397 398 399
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

400 401 402 403 404 405 406 407 408 409 410 411
  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 已提交
412 413 414 415 416 417 418 419 420
  # 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
421
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
422 423
  end

424 425 426
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
427
    message << title.to_s
428
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
429
    message << description.to_s
430 431
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
432
    message
433
  end
434

Z
Zeger-Jan van de Weg 已提交
435 436
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
437

Z
Zeger-Jan van de Weg 已提交
438 439
    self.merge_when_build_succeeds = false
    self.merge_user = nil
440 441 442 443
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
444 445 446 447

    self.save
  end

448
  # Return array of possible target branches
S
Steven Burgart 已提交
449
  # depends on target project of MR
450 451 452 453 454 455 456 457 458
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
459
  # depends on source project of MR
460 461 462 463 464 465 466
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
467 468

  def locked_long_ago?
B
Ben Bodenmiller 已提交
469 470 471
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
472
  end
473 474 475 476 477 478 479 480

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

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

482 483 484 485
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

486 487 488
  def can_be_merged_by?(user)
    ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
  end
489

490 491
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
492

R
Rémy Coutable 已提交
493
    !pipeline || pipeline.success?
494 495
  end

496 497 498 499 500 501 502 503 504
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
505

506 507 508 509 510 511 512 513 514 515
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

516
  def target_sha
517 518 519
    return @base_target_sha if defined?(@base_target_sha)

    target_project.repository.commit(target_branch).try(:sha)
520 521 522
  end

  def source_sha
523 524
    return @head_source_sha if defined?(@head_source_sha)

525 526 527 528 529
    last_commit.try(:sha) || source_tip.try(:sha)
  end

  def source_tip
    source_branch && source_project.repository.commit(source_branch)
530 531 532 533 534 535
  end

  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
536
      ref_path
537 538 539
    )
  end

540 541 542 543 544
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

  def ref_is_fetched?
545
    File.exist?(File.join(project.repository.path_to_repo, ref_path))
546 547 548 549 550 551
  end

  def ensure_ref_fetched
    fetch_ref unless ref_is_fetched?
  end

552 553 554 555 556 557 558 559
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
560

561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

    if cache.blank? || cache[:source_sha] != source_sha || cache[:target_sha] != target_sha
      cache = {
        source_sha: source_sha,
        target_sha: target_sha,
        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
577 578
    return 0 unless source_sha && target_sha

579 580
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_sha, target_sha).size
  end
581
  private :compute_diverged_commits_count
582 583 584 585 586

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

587 588
  def pipeline
    @pipeline ||= source_project.pipeline(last_commit.id, source_branch) if last_commit && source_project
589
  end
590

D
Douwe Maan 已提交
591
  def diff_refs
592 593 594
    return nil unless diff_base_commit

    [diff_base_commit, last_commit]
595
  end
596 597 598 599 600

  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

601 602
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
603
  end
604 605 606 607

  def can_be_cherry_picked?
    merge_commit
  end
D
Dmitriy Zaporozhets 已提交
608
end