2012-11-19 18:24:05 +00: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 08:40:56 +00:00
# milestone_id :integer
2013-03-15 13:16:02 +00:00
# state :string(255)
# merge_status :string(255)
#
2012-11-19 18:24:05 +00:00
2012-09-26 18:52:01 +00:00
require Rails . root . join ( " app/models/commit " )
2013-01-02 22:01:08 +00:00
require Rails . root . join ( " lib/static_model " )
2012-03-14 22:57:43 +00:00
2011-11-28 07:39:43 +00:00
class MergeRequest < ActiveRecord :: Base
2013-01-03 07:06:07 +00:00
include Issuable
2012-06-07 12:44:57 +00:00
2013-02-18 08:40:56 +00:00
attr_accessible :title , :assignee_id , :target_branch , :source_branch , :milestone_id ,
2013-02-18 09:07:49 +00:00
:author_id_of_changes , :state_event
2012-09-26 18:17:17 +00:00
2012-10-09 00:10:04 +00:00
attr_accessor :should_remove_source_branch
2013-02-18 13:22:18 +00:00
state_machine :state , initial : :opened do
2013-02-18 08:40:56 +00:00
event :close do
transition [ :reopened , :opened ] = > :closed
end
event :merge do
transition [ :reopened , :opened ] = > :merged
end
event :reopen do
2013-02-18 13:22:18 +00:00
transition closed : :reopened
2013-02-18 08:40:56 +00:00
end
state :opened
state :reopened
state :closed
state :merged
end
2013-02-20 13:15:01 +00:00
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
2013-02-26 08:38:40 +00:00
state :unchecked
2012-07-05 19:59:37 +00:00
2013-02-20 13:15:01 +00:00
state :can_be_merged
state :cannot_be_merged
end
2012-03-30 05:05:04 +00:00
2012-03-14 22:57:43 +00:00
serialize :st_commits
serialize :st_diffs
2012-10-09 00:10:04 +00:00
validates :source_branch , presence : true
validates :target_branch , presence : true
2013-02-20 13:15:01 +00:00
validate :validate_branches
2011-11-28 07:39:43 +00:00
2013-02-18 08:40:56 +00:00
scope :merged , - > { with_state ( :merged ) }
2013-02-20 13:37:20 +00: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 ) }
2013-02-26 08:38:40 +00:00
scope :by_milestone , - > ( milestone ) { where ( milestone_id : milestone ) }
2012-03-15 23:45:46 +00:00
2013-02-21 12:11:24 +00:00
# Closed scope for merge request should return
# both merged and closed mr's
scope :closed , - > { with_states ( :closed , :merged ) }
2012-03-13 21:54:49 +00:00
def validate_branches
2012-03-14 22:51:03 +00:00
if target_branch == source_branch
2013-03-07 13:51:56 +00:00
errors . add :branch_conflict , " You can not use same branch for source and target branches "
2012-03-13 21:54:49 +00:00
end
end
2012-03-15 23:45:46 +00:00
def reload_code
self . reloaded_commits
self . reloaded_diffs
end
2012-03-30 05:05:04 +00:00
def check_if_can_be_merged
2013-02-20 13:15:01 +00:00
if Gitlab :: Satellite :: MergeAction . new ( self . author , self ) . can_be_merged?
mark_as_mergeable
else
mark_as_unmergeable
end
2012-03-29 21:27:42 +00:00
end
2011-11-29 18:06:37 +00:00
def diffs
2013-04-15 16:01:36 +00:00
load_diffs ( st_diffs ) || [ ]
2012-03-14 22:57:43 +00:00
end
def reloaded_diffs
2013-02-18 08:40:56 +00:00
if opened? && unmerged_diffs . any?
2013-04-15 16:01:36 +00:00
self . st_diffs = dump_diffs ( unmerged_diffs )
2012-07-05 19:59:37 +00:00
self . save
2012-03-14 22:57:43 +00:00
end
2012-07-05 19:59:37 +00:00
end
def broken_diffs?
2013-04-15 16:01:36 +00:00
diffs == [ Gitlab :: Git :: Diff :: BROKEN_DIFF ]
2012-07-05 19:59:37 +00:00
end
def valid_diffs?
! broken_diffs?
2012-03-14 22:57:43 +00:00
end
def unmerged_diffs
2013-04-15 16:01:36 +00:00
project . repository . diffs_between ( source_branch , target_branch )
2011-11-29 18:06:37 +00:00
end
def last_commit
2012-03-14 22:57:43 +00:00
commits . first
2011-11-29 18:06:37 +00:00
end
2012-03-14 22:51:03 +00:00
2012-03-15 21:32:00 +00:00
def merge_event
2013-02-13 11:48:16 +00:00
self . project . events . where ( target_id : self . id , target_type : " MergeRequest " , action : Event :: MERGED ) . last
2012-03-15 21:32:00 +00:00
end
2012-03-15 23:45:46 +00:00
def closed_event
2013-02-13 11:48:16 +00:00
self . project . events . where ( target_id : self . id , target_type : " MergeRequest " , action : Event :: CLOSED ) . last
2012-03-15 23:45:46 +00:00
end
2012-03-14 22:57:43 +00:00
def commits
2013-04-02 19:37:20 +00:00
load_commits ( st_commits || [ ] )
2012-03-14 22:57:43 +00:00
end
def probably_merged?
2012-08-09 01:40:57 +00:00
unmerged_commits . empty? &&
2013-02-18 08:40:56 +00:00
commits . any? && opened?
2012-03-29 21:27:42 +00:00
end
2012-08-09 01:40:57 +00:00
def reloaded_commits
2013-02-18 08:40:56 +00:00
if opened? && unmerged_commits . any?
2013-04-02 18:30:36 +00:00
self . st_commits = dump_commits ( unmerged_commits )
2012-03-14 22:57:43 +00:00
save
end
commits
end
def unmerged_commits
2013-03-31 15:49:58 +00:00
self . project . repository .
2012-03-14 22:57:43 +00:00
commits_between ( self . target_branch , self . source_branch ) .
sort_by ( & :created_at ) .
reverse
end
2012-03-15 23:45:46 +00:00
def merge! ( user_id )
2013-02-27 15:48:51 +00:00
self . author_id_of_changes = user_id
2013-02-18 08:40:56 +00:00
self . merge
2012-03-15 23:45:46 +00:00
end
2012-03-30 05:05:04 +00:00
2012-03-30 05:15:04 +00:00
def automerge! ( current_user )
2012-10-25 22:26:47 +00:00
if Gitlab :: Satellite :: MergeAction . new ( current_user , self ) . merge! && self . unmerged_commits . empty?
2012-03-30 05:05:04 +00:00
self . merge! ( current_user . id )
true
end
2012-06-04 21:08:41 +00:00
rescue
2013-02-20 13:15:01 +00:00
mark_as_unmergeable
2012-03-30 05:05:04 +00:00
false
end
2012-07-04 22:26:23 +00:00
2012-10-04 22:25:40 +00:00
def mr_and_commit_notes
commit_ids = commits . map ( & :id )
2012-12-18 18:02:00 +00: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 22:25:40 +00:00
end
2012-11-22 23:55:57 +00: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 03:14:05 +00:00
def last_commit_short_sha
@last_commit_short_sha || = last_commit . sha [ 0 .. 10 ]
end
2013-04-02 18:30:36 +00:00
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
2013-04-15 16:01:36 +00:00
def dump_diffs ( diffs )
diffs . map ( & :to_hash )
end
def load_diffs ( array )
array . map { | hash | Gitlab :: Git :: Diff . new ( hash ) }
end
2011-11-28 07:39:43 +00:00
end