gitlab-org--gitlab-foss/app/models/merge_request.rb

226 lines
5.5 KiB
Ruby
Raw Normal View History

2012-11-19 13:24:05 -05:00
# == Schema Information
#
# Table name: merge_requests
#
# id :integer not null, primary key
# target_branch :string(255) not null
# source_branch :string(255) not null
# project_id :integer not null
# author_id :integer
# assignee_id :integer
# title :string(255)
# created_at :datetime not null
# updated_at :datetime not null
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
2013-02-18 03:40:56 -05:00
# milestone_id :integer
2013-03-15 09:16:02 -04:00
# state :string(255)
# merge_status :string(255)
#
2012-11-19 13:24:05 -05:00
2012-09-26 14:52:01 -04:00
require Rails.root.join("app/models/commit")
2013-01-02 17:01:08 -05:00
require Rails.root.join("lib/static_model")
2011-11-28 02:39:43 -05:00
class MergeRequest < ActiveRecord::Base
2013-01-03 02:06:07 -05:00
include Issuable
BROKEN_DIFF = "--broken-diff"
2013-02-18 03:40:56 -05:00
attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
2013-02-18 04:07:49 -05:00
:author_id_of_changes, :state_event
2012-10-08 20:10:04 -04:00
attr_accessor :should_remove_source_branch
2013-02-18 08:22:18 -05:00
state_machine :state, initial: :opened do
2013-02-18 03:40:56 -05:00
event :close do
transition [:reopened, :opened] => :closed
end
event :merge do
transition [:reopened, :opened] => :merged
end
event :reopen do
2013-02-18 08:22:18 -05:00
transition closed: :reopened
2013-02-18 03:40:56 -05:00
end
state :opened
state :reopened
state :closed
state :merged
end
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
transition unchecked: :can_be_merged
end
event :mark_as_unmergeable do
transition unchecked: :cannot_be_merged
end
state :unchecked
state :can_be_merged
state :cannot_be_merged
end
serialize :st_commits
serialize :st_diffs
2012-10-08 20:10:04 -04:00
validates :source_branch, presence: true
validates :target_branch, presence: true
validate :validate_branches
2011-11-28 02:39:43 -05:00
2013-02-18 03:40:56 -05:00
scope :merged, -> { with_state(:merged) }
2013-02-20 08:37:20 -05:00
scope :by_branch, ->(branch_name) { where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name) }
scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
# Closed scope for merge request should return
# both merged and closed mr's
scope :closed, -> { with_states(:closed, :merged) }
def validate_branches
if target_branch == source_branch
errors.add :branch_conflict, "You can not use same branch for source and target branches"
end
end
def reload_code
self.reloaded_commits
self.reloaded_diffs
end
def check_if_can_be_merged
if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
mark_as_mergeable
else
mark_as_unmergeable
end
2012-03-29 17:27:42 -04:00
end
2011-11-29 13:06:37 -05:00
def diffs
st_diffs || []
end
def reloaded_diffs
2013-02-18 03:40:56 -05:00
if opened? && unmerged_diffs.any?
self.st_diffs = unmerged_diffs
self.save
end
rescue Grit::Git::GitTimeout
self.st_diffs = [BROKEN_DIFF]
self.save
end
def broken_diffs?
diffs == [BROKEN_DIFF]
end
def valid_diffs?
!broken_diffs?
end
def unmerged_diffs
# Only show what is new in the source branch compared to the target branch, not the other way around.
# The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
# From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
common_commit = project.repo.git.native(:merge_base, {}, [target_branch, source_branch]).strip
diffs = project.repo.diff(common_commit, source_branch)
2011-11-29 13:06:37 -05:00
end
def last_commit
commits.first
2011-11-29 13:06:37 -05:00
end
2012-03-15 17:32:00 -04:00
def merge_event
2013-02-13 06:48:16 -05:00
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
2012-03-15 17:32:00 -04:00
end
def closed_event
2013-02-13 06:48:16 -05:00
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
end
def commits
2013-04-02 15:37:20 -04:00
load_commits(st_commits || [])
end
def probably_merged?
unmerged_commits.empty? &&
2013-02-18 03:40:56 -05:00
commits.any? && opened?
2012-03-29 17:27:42 -04:00
end
def reloaded_commits
2013-02-18 03:40:56 -05:00
if opened? && unmerged_commits.any?
self.st_commits = dump_commits(unmerged_commits)
save
end
commits
end
def unmerged_commits
2013-03-31 11:49:58 -04:00
self.project.repository.
commits_between(self.target_branch, self.source_branch).
sort_by(&:created_at).
reverse
end
def merge!(user_id)
2013-02-27 10:48:51 -05:00
self.author_id_of_changes = user_id
2013-02-18 03:40:56 -05:00
self.merge
end
def automerge!(current_user)
if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
self.merge!(current_user.id)
true
end
2012-06-04 17:08:41 -04:00
rescue
mark_as_unmergeable
false
end
2012-07-04 18:26:23 -04:00
def mr_and_commit_notes
commit_ids = commits.map(&:id)
Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
end
# Returns the raw diff for this merge request
#
# see "git diff"
def to_diff
project.repo.git.native(:diff, {timeout: 30, raise: true}, "#{target_branch}...#{source_branch}")
end
# Returns the commit as a series of email patches.
#
# see "git format-patch"
def to_patch
project.repo.git.format_patch({timeout: 30, raise: true, stdout: true}, "#{target_branch}..#{source_branch}")
end
def last_commit_short_sha
@last_commit_short_sha ||= last_commit.sha[0..10]
end
private
def dump_commits(commits)
commits.map(&:to_hash)
end
def load_commits(array)
array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
end
2011-11-28 02:39:43 -05:00
end