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

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

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

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

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

46
  after_create :create_merge_request_diff, unless: :importing
D
Dmitriy Zaporozhets 已提交
47
  after_update :update_merge_request_diff
48

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

J
James Lopez 已提交
51 52
  attr_accessor :importing

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

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

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

    event :reopen do
A
Andrew8xx8 已提交
71
      transition closed: :reopened
A
Andrew8xx8 已提交
72 73
    end

74
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
75 76 77
      transition [:reopened, :opened] => :locked
    end

78
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
79 80 81
      transition locked: :reopened
    end

82 83 84 85 86
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

87
    after_transition locked: (any - :locked) do |merge_request, transition|
88 89 90 91
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
92 93 94 95
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
96
    state :locked
A
Andrew8xx8 已提交
97 98
  end

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

    event :mark_as_unmergeable do
109
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
110 111
    end

112
    state :unchecked
113 114
    state :can_be_merged
    state :cannot_be_merged
115 116 117 118 119 120 121 122 123

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

126
  validates :source_project, presence: true, unless: [:allow_broken, :importing]
A
Andrey Kumanyaev 已提交
127
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
128
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
129
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
130
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
J
James Lopez 已提交
131
  validate :validate_branches, unless: [:allow_broken, :importing]
132
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
133

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

142 143 144
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

145 146 147 148
  def self.reference_prefix
    '!'
  end

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

159
  def self.link_reference_pattern
160
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
161 162
  end

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

181 182 183 184 185 186 187 188 189 190
  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

191 192
  def last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
193
  end
194 195 196

  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
197
  end
198

J
Jacob Vosmaer 已提交
199 200 201 202
  def diff_size
    merge_request_diff.size
  end

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

211 212 213 214
  def last_commit_short_sha
    last_commit.short_id
  end

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

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

230
  def validate_fork
231 232 233
    return true unless target_project && source_project

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

D
Dmitriy Zaporozhets 已提交
247 248 249 250 251 252
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

253
  def reload_code
254
    if merge_request_diff && open?
255 256
      merge_request_diff.reload_content
    end
257 258
  end

259
  def check_if_can_be_merged
260 261
    return unless unchecked?

262
    can_be_merged =
263
      !broken? && project.repository.can_be_merged?(source_sha, target_branch)
264 265

    if can_be_merged
266 267 268 269
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
270 271
  end

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

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

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

282
  def work_in_progress?
283
    !!(title =~ WIP_REGEX)
284 285 286 287
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
288 289
  end

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

    check_if_can_be_merged

    can_be_merged?
296 297
  end

298
  def gitlab_merge_status
299 300 301 302 303 304 305
    if work_in_progress?
      "work_in_progress"
    else
      merge_status_name
    end
  end

306 307
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
308 309
  end

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

317
  def mr_and_commit_notes
318 319 320 321
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

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

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

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

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

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

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
361 362 363 364
  def for_fork?
    target_project != source_project
  end

365 366 367 368
  def project
    target_project
  end

369 370 371 372
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

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

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
380 381 382 383 384
    else
      []
    end
  end

385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400
  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

401 402 403 404 405 406 407 408
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

409 410 411 412 413 414 415 416
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

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

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

Z
Zeger-Jan van de Weg 已提交
452 453
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
454

Z
Zeger-Jan van de Weg 已提交
455 456 457 458 459 460 461
    self.merge_when_build_succeeds = false
    self.merge_user = nil
    self.merge_params = nil

    self.save
  end

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

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

  def locked_long_ago?
B
Ben Bodenmiller 已提交
483 484 485
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
486
  end
487 488 489 490 491 492 493 494

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

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

496 497 498 499
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

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

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

514 515 516 517 518 519 520 521 522 523
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

524
  def target_sha
525
    @target_sha ||= target_project.repository.commit(target_branch).try(:sha)
526 527 528
  end

  def source_sha
529 530 531 532 533
    last_commit.try(:sha) || source_tip.try(:sha)
  end

  def source_tip
    source_branch && source_project.repository.commit(source_branch)
534 535 536 537 538 539
  end

  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
540
      ref_path
541 542 543
    )
  end

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

556 557 558 559 560 561 562 563
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
564

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

583 584
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_sha, target_sha).size
  end
585
  private :compute_diverged_commits_count
586 587 588 589 590

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

591
  def ci_commit
K
Kamil Trzcinski 已提交
592
    @ci_commit ||= source_project.ci_commit(last_commit.id, source_branch) if last_commit && source_project
593
  end
594

D
Douwe Maan 已提交
595
  def diff_refs
596 597 598
    return nil unless diff_base_commit

    [diff_base_commit, last_commit]
599
  end
600 601 602 603 604

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

605 606
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
607
  end
608 609 610 611

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