2012-11-19 19:24:05 +01: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)
2013-02-18 09:40:56 +01:00
# state :string(255) not null
2012-11-19 19:24:05 +01:00
# created_at :datetime not null
# updated_at :datetime not null
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
2013-02-15 09:27:13 +01:00
# merge_status :integer default(1), not null
2012-11-19 19:24:05 +01:00
#
2013-02-18 09:40:56 +01:00
# milestone_id :integer
2012-11-19 19:24:05 +01:00
2012-09-26 20:52:01 +02:00
require Rails . root . join ( " app/models/commit " )
2013-01-02 23:01:08 +01:00
require Rails . root . join ( " lib/static_model " )
2012-03-14 23:57:43 +01:00
2011-11-28 08:39:43 +01:00
class MergeRequest < ActiveRecord :: Base
2013-01-03 08:06:07 +01:00
include Issuable
2012-06-07 14:44:57 +02:00
2013-02-18 09:40:56 +01:00
attr_accessible :title , :assignee_id , :target_branch , :source_branch , :milestone_id ,
2013-02-18 10:07:49 +01:00
:author_id_of_changes , :state_event
2012-09-26 20:17:17 +02:00
2012-10-09 02:10:04 +02:00
attr_accessor :should_remove_source_branch
2013-02-18 14:22:18 +01:00
state_machine :state , initial : :opened do
2013-02-18 09:40:56 +01:00
event :close do
transition [ :reopened , :opened ] = > :closed
end
event :merge do
transition [ :reopened , :opened ] = > :merged
end
event :reopen do
2013-02-18 14:22:18 +01:00
transition closed : :reopened
2013-02-18 09:40:56 +01:00
end
state :opened
state :reopened
state :closed
state :merged
end
2012-07-05 21:59:37 +02:00
BROKEN_DIFF = " --broken-diff "
2012-03-30 07:05:04 +02:00
UNCHECKED = 1
CAN_BE_MERGED = 2
CANNOT_BE_MERGED = 3
2012-03-14 23:57:43 +01:00
serialize :st_commits
serialize :st_diffs
2012-10-09 02:10:04 +02:00
validates :source_branch , presence : true
validates :target_branch , presence : true
2012-03-13 22:54:49 +01:00
validate :validate_branches
2011-11-28 08:39:43 +01:00
2013-02-18 09:40:56 +01:00
scope :merged , - > { with_state ( :merged ) }
2012-03-16 00:45:46 +01:00
def self . find_all_by_branch ( branch_name )
2012-10-08 17:54:51 +02:00
where ( " source_branch LIKE :branch OR target_branch LIKE :branch " , branch : branch_name )
2012-03-16 00:45:46 +01:00
end
2012-10-26 14:52:10 +02:00
def self . find_all_by_milestone ( milestone )
where ( " milestone_id = :milestone_id " , milestone_id : milestone )
end
2013-02-15 09:27:13 +01:00
def human_merge_status
merge_statuses = {
2012-04-16 21:08:03 +02:00
CAN_BE_MERGED = > " can_be_merged " ,
CANNOT_BE_MERGED = > " cannot_be_merged " ,
UNCHECKED = > " unchecked "
}
2013-02-15 09:27:13 +01:00
merge_statuses [ self . merge_status ]
2012-04-16 21:08:03 +02:00
end
2012-03-13 22:54:49 +01:00
def validate_branches
2012-03-14 23:51:03 +01:00
if target_branch == source_branch
2012-03-13 22:54:49 +01:00
errors . add :base , " You can not use same branch for source and target branches "
end
end
2012-03-16 00:45:46 +01:00
def reload_code
self . reloaded_commits
self . reloaded_diffs
end
2012-03-30 07:05:04 +02:00
def unchecked?
2013-02-15 09:27:13 +01:00
merge_status == UNCHECKED
2012-03-30 07:05:04 +02:00
end
2012-03-30 07:15:04 +02:00
def mark_as_unchecked
2013-02-15 09:27:13 +01:00
self . merge_status = UNCHECKED
2012-09-26 20:17:17 +02:00
self . save
2012-03-30 07:15:04 +02:00
end
2012-03-29 23:27:42 +02:00
def can_be_merged?
2013-02-15 09:27:13 +01:00
merge_status == CAN_BE_MERGED
2012-03-30 07:05:04 +02:00
end
def check_if_can_be_merged
2013-02-15 09:27:13 +01:00
self . merge_status = if Gitlab :: Satellite :: MergeAction . new ( self . author , self ) . can_be_merged?
2012-03-30 07:05:04 +02:00
CAN_BE_MERGED
else
CANNOT_BE_MERGED
end
self . save
2012-03-29 23:27:42 +02:00
end
2011-11-29 19:06:37 +01:00
def diffs
2012-03-14 23:57:43 +01:00
st_diffs || [ ]
end
def reloaded_diffs
2013-02-18 09:40:56 +01:00
if opened? && unmerged_diffs . any?
2012-03-14 23:57:43 +01:00
self . st_diffs = unmerged_diffs
2012-07-05 21:59:37 +02:00
self . save
2012-03-14 23:57:43 +01:00
end
2012-07-05 21:59:37 +02:00
rescue Grit :: Git :: GitTimeout
self . st_diffs = [ BROKEN_DIFF ]
self . save
end
def broken_diffs?
diffs == [ BROKEN_DIFF ]
end
def valid_diffs?
! broken_diffs?
2012-03-14 23:57:43 +01:00
end
def unmerged_diffs
2012-08-21 23:07:11 +02:00
# 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 19:06:37 +01:00
end
def last_commit
2012-03-14 23:57:43 +01:00
commits . first
2011-11-29 19:06:37 +01:00
end
2012-03-14 23:51:03 +01:00
2012-03-15 22:32:00 +01:00
def merge_event
2013-02-13 12:48:16 +01:00
self . project . events . where ( target_id : self . id , target_type : " MergeRequest " , action : Event :: MERGED ) . last
2012-03-15 22:32:00 +01:00
end
2012-03-16 00:45:46 +01:00
def closed_event
2013-02-13 12:48:16 +01:00
self . project . events . where ( target_id : self . id , target_type : " MergeRequest " , action : Event :: CLOSED ) . last
2012-03-16 00:45:46 +01:00
end
2012-03-14 23:57:43 +01:00
def commits
st_commits || [ ]
end
def probably_merged?
2012-08-09 03:40:57 +02:00
unmerged_commits . empty? &&
2013-02-18 09:40:56 +01:00
commits . any? && opened?
2012-03-29 23:27:42 +02:00
end
def mark_as_unmergable
2013-02-15 09:27:13 +01:00
self . merge_status = CANNOT_BE_MERGED
2012-10-20 15:27:34 +02:00
self . save
2012-03-14 23:57:43 +01:00
end
2012-08-09 03:40:57 +02:00
def reloaded_commits
2013-02-18 09:40:56 +01:00
if opened? && unmerged_commits . any?
2012-03-14 23:57:43 +01:00
self . st_commits = unmerged_commits
save
end
commits
end
def unmerged_commits
self . project . repo .
commits_between ( self . target_branch , self . source_branch ) .
map { | c | Commit . new ( c ) } .
sort_by ( & :created_at ) .
reverse
end
2012-03-16 00:45:46 +01:00
def merge! ( user_id )
2013-02-18 09:40:56 +01:00
self . merge
2012-03-16 00:45:46 +01:00
Event . create (
2012-08-11 00:07:50 +02:00
project : self . project ,
2013-02-13 12:48:16 +01:00
action : Event :: MERGED ,
2012-08-11 00:07:50 +02:00
target_id : self . id ,
target_type : " MergeRequest " ,
author_id : user_id
2012-03-16 00:45:46 +01:00
)
end
2012-03-30 07:05:04 +02:00
2012-03-30 07:15:04 +02:00
def automerge! ( current_user )
2012-10-26 00:26:47 +02:00
if Gitlab :: Satellite :: MergeAction . new ( current_user , self ) . merge! && self . unmerged_commits . empty?
2012-03-30 07:05:04 +02:00
self . merge! ( current_user . id )
true
end
2012-06-04 23:08:41 +02:00
rescue
2012-03-30 07:05:04 +02:00
self . mark_as_unmergable
false
end
2012-07-05 00:26:23 +02:00
2012-10-05 00:25:40 +02:00
def mr_and_commit_notes
commit_ids = commits . map ( & :id )
2012-12-18 19:02:00 +01:00
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 )
2012-10-05 00:25:40 +02:00
end
2012-11-23 00:55:57 +01:00
# 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
2012-12-11 04:14:05 +01:00
def last_commit_short_sha
@last_commit_short_sha || = last_commit . sha [ 0 .. 10 ]
end
2011-11-28 08:39:43 +01:00
end