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)
# closed :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
# merged :boolean default(FALSE), not null
# state :integer default(1), not null
# milestone_id :integer
#
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 " )
2012-03-14 18:57:43 -04:00
2011-11-28 02:39:43 -05:00
class MergeRequest < ActiveRecord :: Base
2013-01-03 02:06:07 -05:00
include Issuable
2012-06-07 08:44:57 -04:00
2012-10-26 08:52:10 -04:00
attr_accessible :title , :assignee_id , :closed , :target_branch , :source_branch , :milestone_id ,
2012-09-26 14:17:17 -04:00
:author_id_of_changes
2012-10-08 20:10:04 -04:00
attr_accessor :should_remove_source_branch
2012-07-05 15:59:37 -04:00
BROKEN_DIFF = " --broken-diff "
2012-03-30 01:05:04 -04:00
UNCHECKED = 1
CAN_BE_MERGED = 2
CANNOT_BE_MERGED = 3
2012-03-14 18:57:43 -04:00
serialize :st_commits
serialize :st_diffs
2012-10-08 20:10:04 -04:00
validates :source_branch , presence : true
validates :target_branch , presence : true
2012-03-13 17:54:49 -04:00
validate :validate_branches
2011-11-28 02:39:43 -05:00
2012-03-15 19:45:46 -04:00
def self . find_all_by_branch ( branch_name )
2012-10-08 11:54:51 -04:00
where ( " source_branch LIKE :branch OR target_branch LIKE :branch " , branch : branch_name )
2012-03-15 19:45:46 -04:00
end
2012-10-26 08:52:10 -04:00
def self . find_all_by_milestone ( milestone )
where ( " milestone_id = :milestone_id " , milestone_id : milestone )
end
2012-04-16 15:08:03 -04:00
def human_state
states = {
CAN_BE_MERGED = > " can_be_merged " ,
CANNOT_BE_MERGED = > " cannot_be_merged " ,
UNCHECKED = > " unchecked "
}
states [ self . state ]
end
2012-03-13 17:54:49 -04:00
def validate_branches
2012-03-14 18:51:03 -04:00
if target_branch == source_branch
2012-03-13 17:54:49 -04:00
errors . add :base , " You can not use same branch for source and target branches "
end
end
2012-03-15 19:45:46 -04:00
def reload_code
self . reloaded_commits
self . reloaded_diffs
end
2012-03-30 01:05:04 -04:00
def unchecked?
state == UNCHECKED
end
2012-03-30 01:15:04 -04:00
def mark_as_unchecked
2012-09-26 14:17:17 -04:00
self . state = UNCHECKED
self . save
2012-03-30 01:15:04 -04:00
end
2012-03-29 17:27:42 -04:00
def can_be_merged?
2012-03-30 01:05:04 -04:00
state == CAN_BE_MERGED
end
def check_if_can_be_merged
2012-10-25 18:26:47 -04:00
self . state = if Gitlab :: Satellite :: MergeAction . new ( self . author , self ) . can_be_merged?
2012-03-30 01:05:04 -04:00
CAN_BE_MERGED
else
CANNOT_BE_MERGED
end
self . save
2012-03-29 17:27:42 -04:00
end
2011-11-29 13:06:37 -05:00
def diffs
2012-03-14 18:57:43 -04:00
st_diffs || [ ]
end
def reloaded_diffs
if open ? && unmerged_diffs . any?
self . st_diffs = unmerged_diffs
2012-07-05 15:59:37 -04:00
self . save
2012-03-14 18:57:43 -04:00
end
2012-07-05 15:59:37 -04: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 18:57:43 -04:00
end
def unmerged_diffs
2012-08-21 17:07:11 -04: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 13:06:37 -05:00
end
def last_commit
2012-03-14 18:57:43 -04:00
commits . first
2011-11-29 13:06:37 -05:00
end
2012-03-14 18:51:03 -04:00
2012-08-08 21:40:57 -04:00
def merged?
2012-03-15 19:45:46 -04:00
merged && merge_event
end
2012-03-15 17:32:00 -04:00
def merge_event
2012-08-10 18:07:50 -04: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
2012-03-15 19:45:46 -04:00
def closed_event
2012-08-10 18:07:50 -04:00
self . project . events . where ( target_id : self . id , target_type : " MergeRequest " , action : Event :: Closed ) . last
2012-03-15 19:45:46 -04:00
end
2012-03-14 18:57:43 -04:00
def commits
st_commits || [ ]
end
def probably_merged?
2012-08-08 21:40:57 -04:00
unmerged_commits . empty? &&
2012-03-14 18:57:43 -04:00
commits . any? && open ?
end
def open?
! closed
end
def mark_as_merged!
self . merged = true
self . closed = true
save
2012-03-29 17:27:42 -04:00
end
def mark_as_unmergable
2012-10-20 09:27:34 -04:00
self . state = CANNOT_BE_MERGED
self . save
2012-03-14 18:57:43 -04:00
end
2012-08-08 21:40:57 -04:00
def reloaded_commits
if open ? && unmerged_commits . any?
2012-03-14 18:57:43 -04: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-15 19:45:46 -04:00
def merge! ( user_id )
self . mark_as_merged!
Event . create (
2012-08-10 18:07:50 -04:00
project : self . project ,
action : Event :: Merged ,
target_id : self . id ,
target_type : " MergeRequest " ,
author_id : user_id
2012-03-15 19:45:46 -04:00
)
end
2012-03-30 01:05:04 -04:00
2012-03-30 01:15:04 -04:00
def automerge! ( current_user )
2012-10-25 18:26:47 -04:00
if Gitlab :: Satellite :: MergeAction . new ( current_user , self ) . merge! && self . unmerged_commits . empty?
2012-03-30 01:05:04 -04:00
self . merge! ( current_user . id )
true
end
2012-06-04 17:08:41 -04:00
rescue
2012-03-30 01:05:04 -04:00
self . mark_as_unmergable
false
end
2012-07-04 18:26:23 -04:00
2012-10-04 18:25:40 -04:00
def mr_and_commit_notes
commit_ids = commits . map ( & :id )
2012-12-18 13:02:00 -05: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-04 18:25:40 -04:00
end
2012-11-22 18:55:57 -05: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-10 22:14:05 -05:00
def last_commit_short_sha
@last_commit_short_sha || = last_commit . sha [ 0 .. 10 ]
end
2011-11-28 02:39:43 -05:00
end