merge_request.rb 12.0 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3 4
# == Schema Information
#
# Table name: merge_requests
#
D
Dmitriy Zaporozhets 已提交
5 6 7 8 9 10 11
#  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)
D
Dmitriy Zaporozhets 已提交
12 13
#  created_at        :datetime
#  updated_at        :datetime
D
Dmitriy Zaporozhets 已提交
14 15 16 17 18
#  milestone_id      :integer
#  state             :string(255)
#  merge_status      :string(255)
#  target_project_id :integer          not null
#  iid               :integer
D
Dmitriy Zaporozhets 已提交
19
#  description       :text
D
Dmitriy Zaporozhets 已提交
20
#  position          :integer          default(0)
D
Dmitriy Zaporozhets 已提交
21
#  locked_at         :datetime
S
Stan Hu 已提交
22
#  updated_by_id     :integer
D
Dmitriy Zaporozhets 已提交
23
#
D
Dmitriy Zaporozhets 已提交
24

25
require Rails.root.join("app/models/commit")
26
require Rails.root.join("lib/static_model")
27

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

35 36
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
37

38
  has_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
39

40
  after_create :create_merge_request_diff
D
Dmitriy Zaporozhets 已提交
41
  after_update :update_merge_request_diff
42

43
  delegate :commits, :diffs, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
44

D
Dmitriy Zaporozhets 已提交
45 46 47 48
  # 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 已提交
49 50
  # Temporary fields to store compare vars
  # when creating new merge request
D
Dmitriy Zaporozhets 已提交
51
  attr_accessor :can_be_created, :compare_failed,
52
    :compare_commits, :compare_diffs
D
Dmitriy Zaporozhets 已提交
53

A
Andrew8xx8 已提交
54
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
55 56 57 58
    event :close do
      transition [:reopened, :opened] => :closed
    end

59
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
60
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
61 62 63
    end

    event :reopen do
A
Andrew8xx8 已提交
64
      transition closed: :reopened
A
Andrew8xx8 已提交
65 66
    end

67
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
68 69 70
      transition [:reopened, :opened] => :locked
    end

71
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
72 73 74
      transition locked: :reopened
    end

75 76 77 78 79
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

80
    after_transition locked: (any - :locked) do |merge_request, transition|
81 82 83 84
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
85 86 87 88
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
89
    state :locked
A
Andrew8xx8 已提交
90 91
  end

92 93 94 95 96 97
  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
98
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
99 100 101
    end

    event :mark_as_unmergeable do
102
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
103 104
    end

105
    state :unchecked
106 107
    state :can_be_merged
    state :cannot_be_merged
108 109 110 111 112 113 114 115 116

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

D
Dmitriy Zaporozhets 已提交
119
  validates :source_project, presence: true, unless: :allow_broken
A
Andrey Kumanyaev 已提交
120
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
121
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
122
  validates :target_branch, presence: true
I
Izaak Alpert 已提交
123
  validate :validate_branches
124
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
125

126
  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
I
Izaak Alpert 已提交
127
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
128
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
129
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
130
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
131
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
132 133 134
  scope :merged, -> { with_state(:merged) }
  scope :closed, -> { with_state(:closed) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
135

136 137 138 139
  def self.reference_prefix
    '!'
  end

140 141 142 143 144
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
    %r{
145
      (#{Project.reference_pattern})?
146 147 148 149
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

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

160 161 162 163 164 165 166 167 168 169 170 171
  def last_commit
    merge_request_diff ? merge_request_diff.last_commit : compare_commits.last
  end 

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

  def last_commit_short_sha
    last_commit.short_id
  end

172
  def validate_branches
173
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
174
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
175
    end
176

177
    if opened? || reopened?
I
Izaak Alpert 已提交
178
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
179 180
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
181 182 183 184
        errors.add :validate_branches,
                   "Cannot Create: This merge request already exists: #{
                   similar_mrs.pluck(:title)
                   }"
185
      end
186
    end
187 188
  end

189
  def validate_fork
190 191 192
    return true unless target_project && source_project

    if target_project == source_project
193 194 195 196 197 198 199
      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 已提交
200 201
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
202 203 204 205
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
206 207 208 209 210 211
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
    end
  end

212
  def reload_code
213
    if merge_request_diff && open?
214 215
      merge_request_diff.reload_content
    end
216 217
  end

218
  def check_if_can_be_merged
219 220 221 222
    can_be_merged =
      project.repository.can_be_merged?(source_sha, target_branch)

    if can_be_merged
223 224 225 226
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
227 228
  end

D
Dmitriy Zaporozhets 已提交
229
  def merge_event
I
Izaak Alpert 已提交
230
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
231 232
  end

233
  def closed_event
I
Izaak Alpert 已提交
234
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
235 236
  end

237
  def work_in_progress?
238
    !!(title =~ /\A\[?WIP\]?:? /i)
239 240
  end

241
  def mergeable?
242 243 244
    open? && !work_in_progress? && can_be_merged?
  end

245
  def gitlab_merge_status
246 247 248 249 250 251 252
    if work_in_progress?
      "work_in_progress"
    else
      merge_status_name
    end
  end

253
  def mr_and_commit_notes
254 255 256 257
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

258 259
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
260
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
261
      mr_id: id,
262 263 264
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
265
    )
266
  end
267

268 269 270
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
271
  def to_diff(current_user)
272
    target_project.repository.diff_text(target_branch, source_sha)
273 274 275 276 277
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
I
Izaak Alpert 已提交
278
  def to_patch(current_user)
279
    target_project.repository.format_patch(target_branch, source_sha)
280
  end
281

K
Kirill Zaitsev 已提交
282 283 284 285
  def hook_attrs
    attrs = {
      source: source_project.hook_attrs,
      target: target_project.hook_attrs,
286 287
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
288 289 290
    }

    unless last_commit.nil?
291
      attrs.merge!(last_commit: last_commit.hook_attrs)
K
Kirill Zaitsev 已提交
292 293 294 295 296
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
297 298 299 300
  def for_fork?
    target_project != source_project
  end

301 302 303 304
  def project
    target_project
  end

305 306 307 308
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

309
  # Return the set of issues that will be closed if this merge request is accepted.
310
  def closes_issues(current_user = self.author)
311
    if target_branch == project.default_branch
312
      issues = commits.flat_map { |c| c.closes_issues(current_user) }
D
Douwe Maan 已提交
313 314
      issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user).
                  closed_by_message(description))
315
      issues.uniq.sort_by(&:id)
316 317 318 319 320
    else
      []
    end
  end

321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336
  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

337 338 339 340 341 342 343 344
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

345 346 347 348 349 350 351 352
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

353 354 355 356 357 358 359 360 361 362 363 364
  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 已提交
365 366 367 368 369 370 371 372 373
  # 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
374
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
375 376
  end

377 378 379
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
380
    message << title.to_s
381
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
382
    message << description.to_s
383 384
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
385
    message
386
  end
387 388

  # Return array of possible target branches
S
Steven Burgart 已提交
389
  # depends on target project of MR
390 391 392 393 394 395 396 397 398
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
399
  # depends on source project of MR
400 401 402 403 404 405 406
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
407 408

  def locked_long_ago?
B
Ben Bodenmiller 已提交
409 410 411
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
412
  end
413 414 415 416 417 418 419 420

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

  def branch_missing?
    !source_branch_exists? || !target_branch_exists?
  end
421 422 423 424

  def can_be_merged_by?(user)
    ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
  end
425 426 427 428 429 430 431 432 433 434

  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
435 436 437 438 439 440 441 442 443 444 445 446 447 448

  def target_sha
    @target_sha ||= target_project.
      repository.commit(target_branch).sha
  end

  def source_sha
    commits.first.sha
  end

  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
449
      ref_path
450 451 452
    )
  end

453 454 455 456 457 458 459 460 461 462 463 464
  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

465 466 467 468 469 470 471 472
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
D
Dmitriy Zaporozhets 已提交
473
end