merge_request.rb 15.6 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3 4
# == Schema Information
#
# Table name: merge_requests
#
S
Stan Hu 已提交
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
#  id                        :integer          not null, primary key
#  target_branch             :string(255)      not null
#  source_branch             :string(255)      not null
#  source_project_id         :integer          not null
#  author_id                 :integer
#  assignee_id               :integer
#  title                     :string(255)
#  created_at                :datetime
#  updated_at                :datetime
#  milestone_id              :integer
#  state                     :string(255)
#  merge_status              :string(255)
#  target_project_id         :integer          not null
#  iid                       :integer
#  description               :text
#  position                  :integer          default(0)
#  locked_at                 :datetime
#  updated_by_id             :integer
#  merge_error               :string(255)
#  merge_params              :text
#  merge_when_build_succeeds :boolean          default(FALSE), not null
#  merge_user_id             :integer
27
#  merge_commit_sha          :string
D
Dmitriy Zaporozhets 已提交
28
#
D
Dmitriy Zaporozhets 已提交
29

D
Dmitriy Zaporozhets 已提交
30
class MergeRequest < ActiveRecord::Base
31
  include InternalId
32 33
  include Issuable
  include Referable
34
  include Sortable
35
  include Taskable
36

37 38
  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 已提交
39
  belongs_to :merge_user, class_name: "User"
40

41
  has_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
42

Z
Zeger-Jan van de Weg 已提交
43 44
  serialize :merge_params, Hash

45
  after_create :create_merge_request_diff
D
Dmitriy Zaporozhets 已提交
46
  after_update :update_merge_request_diff
47

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

D
Dmitriy Zaporozhets 已提交
50 51 52 53
  # 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 已提交
54 55
  # Temporary fields to store compare vars
  # when creating new merge request
J
Jacob Vosmaer 已提交
56
  attr_accessor :can_be_created, :compare_commits, :compare
D
Dmitriy Zaporozhets 已提交
57

A
Andrew8xx8 已提交
58
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
59 60 61 62
    event :close do
      transition [:reopened, :opened] => :closed
    end

63
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
64
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
65 66 67
    end

    event :reopen do
A
Andrew8xx8 已提交
68
      transition closed: :reopened
A
Andrew8xx8 已提交
69 70
    end

71
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
72 73 74
      transition [:reopened, :opened] => :locked
    end

75
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
76 77 78
      transition locked: :reopened
    end

79 80 81 82 83
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

84
    after_transition locked: (any - :locked) do |merge_request, transition|
85 86 87 88
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
89 90 91 92
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
93
    state :locked
A
Andrew8xx8 已提交
94 95
  end

96 97 98 99 100 101
  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
102
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
103 104 105
    end

    event :mark_as_unmergeable do
106
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
107 108
    end

109
    state :unchecked
110 111
    state :can_be_merged
    state :cannot_be_merged
112 113 114 115 116 117 118 119 120

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

D
Dmitriy Zaporozhets 已提交
123
  validates :source_project, presence: true, unless: :allow_broken
A
Andrey Kumanyaev 已提交
124
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
125
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
126
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
127
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
128
  validate :validate_branches, unless: :allow_broken
129
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
130

I
Izaak Alpert 已提交
131
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
132
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
133
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
134
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
135
  scope :from_project, ->(project) { where(source_project_id: project.id) }
136 137
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
138

139 140 141
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

142 143 144 145
  def self.reference_prefix
    '!'
  end

146 147 148 149
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
150
    @reference_pattern ||= %r{
151
      (#{Project.reference_pattern})?
152 153 154 155
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

156
  def self.link_reference_pattern
157
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
158 159
  end

160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177
  # 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

178 179 180 181 182 183 184 185 186 187
  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

188 189
  def last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
190
  end
191 192 193

  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
194
  end
195

J
Jacob Vosmaer 已提交
196 197 198 199
  def diff_size
    merge_request_diff.size
  end

200 201 202
  def diff_base_commit
    if merge_request_diff
      merge_request_diff.base_commit
D
Douwe Maan 已提交
203
    elsif source_sha
204
      self.target_project.merge_base_commit(self.source_sha, self.target_branch)
205 206 207
    end
  end

208 209 210 211
  def last_commit_short_sha
    last_commit.short_id
  end

212
  def validate_branches
213
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
214
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
215
    end
216

217
    if opened? || reopened?
218
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
219 220
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
221
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
222
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
223
      end
224
    end
225 226
  end

227
  def validate_fork
228 229 230
    return true unless target_project && source_project

    if target_project == source_project
231 232 233 234 235 236 237
      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 已提交
238 239
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
240 241 242 243
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
244 245 246 247 248 249
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

250
  def reload_code
251
    if merge_request_diff && open?
252 253
      merge_request_diff.reload_content
    end
254 255
  end

256
  def check_if_can_be_merged
257 258
    return unless unchecked?

259
    can_be_merged =
260
      !broken? && project.repository.can_be_merged?(source_sha, target_branch)
261 262

    if can_be_merged
263 264 265 266
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
267 268
  end

D
Dmitriy Zaporozhets 已提交
269
  def merge_event
I
Izaak Alpert 已提交
270
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
271 272
  end

273
  def closed_event
I
Izaak Alpert 已提交
274
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
275 276
  end

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

279
  def work_in_progress?
280
    !!(title =~ WIP_REGEX)
281 282 283 284
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
285 286
  end

287
  def mergeable?
R
Rubén Dávila 已提交
288
    return false unless open? && !work_in_progress? && !broken?
289 290 291 292

    check_if_can_be_merged

    can_be_merged?
293 294
  end

295
  def gitlab_merge_status
296 297 298 299 300 301 302
    if work_in_progress?
      "work_in_progress"
    else
      merge_status_name
    end
  end

303 304
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
305 306
  end

307 308 309
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
310 311
      Ability.abilities.allowed?(current_user, :push_code, source_project) &&
      last_commit == source_project.commit(source_branch)
312 313
  end

314
  def mr_and_commit_notes
315 316 317 318
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

319 320
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
321
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
322
      mr_id: id,
323 324 325
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
326
    )
327
  end
328

329 330 331
  # Returns the raw diff for this merge request
  #
  # see "git diff"
332
  def to_diff
333
    target_project.repository.diff_text(diff_base_commit.sha, source_sha)
334 335 336 337 338
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
339
  def to_patch
340
    target_project.repository.format_patch(diff_base_commit.sha, source_sha)
341
  end
342

K
Kirill Zaitsev 已提交
343 344
  def hook_attrs
    attrs = {
345 346
      source: source_project.try(:hook_attrs),
      target: target_project.hook_attrs,
347 348
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
349 350
    }

V
Valery Sizov 已提交
351
    if last_commit
352
      attrs.merge!(last_commit: last_commit.hook_attrs)
K
Kirill Zaitsev 已提交
353 354 355 356 357
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
358 359 360 361
  def for_fork?
    target_project != source_project
  end

362 363 364 365
  def project
    target_project
  end

366 367 368 369
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

370
  # Return the set of issues that will be closed if this merge request is accepted.
371
  def closes_issues(current_user = self.author)
372
    if target_branch == project.default_branch
373 374 375 376
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
377 378 379 380 381
    else
      []
    end
  end

382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397
  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

398 399 400 401 402 403 404 405
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

406 407 408 409 410 411 412 413
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

414 415 416 417 418 419 420 421 422 423 424 425
  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 已提交
426 427 428 429 430 431 432 433 434
  # 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
435
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
436 437
  end

438 439 440
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
441
    message << title.to_s
442
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
443
    message << description.to_s
444 445
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
446
    message
447
  end
448

Z
Zeger-Jan van de Weg 已提交
449 450
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
451

Z
Zeger-Jan van de Weg 已提交
452 453 454 455 456 457 458
    self.merge_when_build_succeeds = false
    self.merge_user = nil
    self.merge_params = nil

    self.save
  end

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

  # Return array of possible source branches
S
Steven Burgart 已提交
470
  # depends on source project of MR
471 472 473 474 475 476 477
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
478 479

  def locked_long_ago?
B
Ben Bodenmiller 已提交
480 481 482
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
483
  end
484 485 486 487 488 489 490 491

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

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

493 494 495 496
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

497 498 499
  def can_be_merged_by?(user)
    ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
  end
500 501 502 503 504 505 506 507 508 509

  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
510

511 512 513 514 515 516 517 518 519 520
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

521
  def target_sha
522
    @target_sha ||= target_project.repository.commit(target_branch).try(:sha)
523 524 525
  end

  def source_sha
526 527 528 529 530
    last_commit.try(:sha) || source_tip.try(:sha)
  end

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

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

541 542 543 544 545 546 547 548 549 550 551 552
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

  def ref_is_fetched?
    File.exists?(File.join(project.repository.path_to_repo, ref_path))
  end

  def ensure_ref_fetched
    fetch_ref unless ref_is_fetched?
  end

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

562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577
  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
578 579
    return 0 unless source_sha && target_sha

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

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

588
  def ci_commit
589
    @ci_commit ||= source_project.ci_commit(last_commit.id) if last_commit && source_project
590
  end
591

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

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

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

602 603
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
604
  end
D
Dmitriy Zaporozhets 已提交
605
end