merge_request.rb 14.6 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

8 9
  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 已提交
10
  belongs_to :merge_user, class_name: "User"
11

12
  has_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
13

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

16
  after_create :create_merge_request_diff
D
Dmitriy Zaporozhets 已提交
17
  after_update :update_merge_request_diff
18

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

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

A
Andrew8xx8 已提交
29
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
30 31 32 33
    event :close do
      transition [:reopened, :opened] => :closed
    end

34
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
35
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
36 37 38
    end

    event :reopen do
A
Andrew8xx8 已提交
39
      transition closed: :reopened
A
Andrew8xx8 已提交
40 41
    end

42
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
43 44 45
      transition [:reopened, :opened] => :locked
    end

46
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
47 48 49
      transition locked: :reopened
    end

50 51 52 53 54
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

55
    after_transition locked: (any - :locked) do |merge_request, transition|
56 57 58 59
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
60 61 62 63
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
64
    state :locked
A
Andrew8xx8 已提交
65 66
  end

67 68 69 70 71 72
  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
73
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
74 75 76
    end

    event :mark_as_unmergeable do
77
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
78 79
    end

80
    state :unchecked
81 82
    state :can_be_merged
    state :cannot_be_merged
83 84 85 86 87 88 89 90 91

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

D
Dmitriy Zaporozhets 已提交
94
  validates :source_project, presence: true, unless: :allow_broken
A
Andrey Kumanyaev 已提交
95
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
96
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
97
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
98
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
99
  validate :validate_branches, unless: :allow_broken
100
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
101

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

110 111 112
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

113 114 115 116
  def self.reference_prefix
    '!'
  end

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

127
  def self.link_reference_pattern
128
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
129 130
  end

131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
  # 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

149 150 151 152 153 154 155 156 157 158
  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

159 160
  def last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
161
  end
162 163 164

  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
165
  end
166

J
Jacob Vosmaer 已提交
167 168 169 170
  def diff_size
    merge_request_diff.size
  end

171 172 173
  def diff_base_commit
    if merge_request_diff
      merge_request_diff.base_commit
D
Douwe Maan 已提交
174
    elsif source_sha
175
      self.target_project.merge_base_commit(self.source_sha, self.target_branch)
176 177 178
    end
  end

179 180 181 182
  def last_commit_short_sha
    last_commit.short_id
  end

183
  def validate_branches
184
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
185
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
186
    end
187

188
    if opened? || reopened?
189
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
190 191
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
192
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
193
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
194
      end
195
    end
196 197
  end

198
  def validate_fork
199 200 201
    return true unless target_project && source_project

    if target_project == source_project
202 203 204 205 206 207 208
      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 已提交
209 210
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
211 212 213 214
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
215 216 217 218 219 220
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

221
  def reload_code
222
    if merge_request_diff && open?
223 224
      merge_request_diff.reload_content
    end
225 226
  end

227
  def check_if_can_be_merged
228 229
    return unless unchecked?

230
    can_be_merged =
231
      !broken? && project.repository.can_be_merged?(source_sha, target_branch)
232 233

    if can_be_merged
234 235 236 237
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
238 239
  end

D
Dmitriy Zaporozhets 已提交
240
  def merge_event
I
Izaak Alpert 已提交
241
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
242 243
  end

244
  def closed_event
I
Izaak Alpert 已提交
245
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
246 247
  end

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

250
  def work_in_progress?
251
    !!(title =~ WIP_REGEX)
252 253 254 255
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
256 257
  end

258
  def mergeable?
R
Rubén Dávila 已提交
259
    return false unless open? && !work_in_progress? && !broken?
260 261 262 263

    check_if_can_be_merged

    can_be_merged?
264 265
  end

266
  def gitlab_merge_status
267 268 269 270 271 272 273
    if work_in_progress?
      "work_in_progress"
    else
      merge_status_name
    end
  end

274 275
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
276 277
  end

278 279 280
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
281 282
      Ability.abilities.allowed?(current_user, :push_code, source_project) &&
      last_commit == source_project.commit(source_branch)
283 284
  end

285
  def mr_and_commit_notes
286 287 288 289
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

290 291
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
292
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
293
      mr_id: id,
294 295 296
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
297
    )
298
  end
299

300 301 302
  # Returns the raw diff for this merge request
  #
  # see "git diff"
303
  def to_diff
304
    target_project.repository.diff_text(diff_base_commit.sha, source_sha)
305 306 307 308 309
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
310
  def to_patch
311
    target_project.repository.format_patch(diff_base_commit.sha, source_sha)
312
  end
313

K
Kirill Zaitsev 已提交
314 315
  def hook_attrs
    attrs = {
316 317
      source: source_project.try(:hook_attrs),
      target: target_project.hook_attrs,
318 319
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
320 321
    }

V
Valery Sizov 已提交
322
    if last_commit
323
      attrs.merge!(last_commit: last_commit.hook_attrs)
K
Kirill Zaitsev 已提交
324 325 326 327 328
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
329 330 331 332
  def for_fork?
    target_project != source_project
  end

333 334 335 336
  def project
    target_project
  end

337 338 339 340
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

341
  # Return the set of issues that will be closed if this merge request is accepted.
342
  def closes_issues(current_user = self.author)
343
    if target_branch == project.default_branch
344 345 346 347
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
348 349 350 351 352
    else
      []
    end
  end

353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368
  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

369 370 371 372 373 374 375 376
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

377 378 379 380 381 382 383 384
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

385 386 387 388 389 390 391 392 393 394 395 396
  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 已提交
397 398 399 400 401 402 403 404 405
  # 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
406
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
407 408
  end

409 410 411
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
412
    message << title.to_s
413
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
414
    message << description.to_s
415 416
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
417
    message
418
  end
419

Z
Zeger-Jan van de Weg 已提交
420 421
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
422

Z
Zeger-Jan van de Weg 已提交
423 424 425 426 427 428 429
    self.merge_when_build_succeeds = false
    self.merge_user = nil
    self.merge_params = nil

    self.save
  end

430
  # Return array of possible target branches
S
Steven Burgart 已提交
431
  # depends on target project of MR
432 433 434 435 436 437 438 439 440
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
441
  # depends on source project of MR
442 443 444 445 446 447 448
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
449 450

  def locked_long_ago?
B
Ben Bodenmiller 已提交
451 452 453
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
454
  end
455 456 457 458 459 460 461 462

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

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

464 465 466 467
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

468 469 470
  def can_be_merged_by?(user)
    ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
  end
471 472 473 474 475 476 477 478 479 480

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

482 483 484 485 486 487 488 489 490 491
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

492
  def target_sha
493
    @target_sha ||= target_project.repository.commit(target_branch).try(:sha)
494 495 496
  end

  def source_sha
497 498 499 500 501
    last_commit.try(:sha) || source_tip.try(:sha)
  end

  def source_tip
    source_branch && source_project.repository.commit(source_branch)
502 503 504 505 506 507
  end

  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
508
      ref_path
509 510 511
    )
  end

512 513 514 515 516
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

  def ref_is_fetched?
517
    File.exist?(File.join(project.repository.path_to_repo, ref_path))
518 519 520 521 522 523
  end

  def ensure_ref_fetched
    fetch_ref unless ref_is_fetched?
  end

524 525 526 527 528 529 530 531
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
532

533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548
  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
549 550
    return 0 unless source_sha && target_sha

551 552
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_sha, target_sha).size
  end
553
  private :compute_diverged_commits_count
554 555 556 557 558

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

559
  def ci_commit
K
Kamil Trzcinski 已提交
560
    @ci_commit ||= source_project.ci_commit(last_commit.id, source_branch) if last_commit && source_project
561
  end
562

D
Douwe Maan 已提交
563
  def diff_refs
564 565 566
    return nil unless diff_base_commit

    [diff_base_commit, last_commit]
567
  end
568 569 570 571 572

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

573 574
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
575
  end
576 577 578 579

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