2012-11-19 18:24:05 +00:00
# == Schema Information
#
# Table name: merge_requests
#
2013-04-25 14:15:33 +00:00
# id :integer not null, primary key
# target_project_id :integer not null
# target_branch :string(255) not null
# source_project_id :integer not null
# source_branch :string(255) not null
# author_id :integer
# assignee_id :integer
# title :string(255)
# created_at :datetime
# updated_at :datetime
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
# milestone_id :integer
# state :string(255)
# merge_status :string(255)
2013-03-15 13:16:02 +00:00
#
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-04-25 14:15:33 +00:00
2013-01-03 07:06:07 +00:00
include Issuable
2012-06-07 12:44:57 +00:00
2013-07-16 21:14:03 +00:00
belongs_to :target_project , foreign_key : :target_project_id , class_name : " Project "
belongs_to :source_project , foreign_key : :source_project_id , class_name : " Project "
2013-04-25 14:15:33 +00:00
2013-06-06 21:22:36 +00:00
attr_accessible :title , :assignee_id , :source_project_id , :source_branch , :target_project_id , :target_branch , :milestone_id , :author_id_of_changes , :state_event
2013-04-25 14:15:33 +00:00
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
2013-04-25 14:15:33 +00:00
validates :source_project , presence : true
2012-10-09 00:10:04 +00:00
validates :source_branch , presence : true
2013-04-25 14:15:33 +00:00
validates :target_project , presence : true
2012-10-09 00:10:04 +00:00
validates :target_branch , presence : true
2013-04-25 14:15:33 +00:00
validate :validate_branches
2011-11-28 07:39:43 +00:00
2013-06-06 21:22:36 +00:00
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 ) }
scope :of_user_team , - > ( team ) { where ( " (source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids)) " , team_project_ids : team . project_ids , team_member_ids : team . member_ids ) }
2013-04-25 14:15:33 +00:00
scope :opened , - > { with_state ( :opened ) }
scope :closed , - > { with_state ( :closed ) }
2013-02-18 08:40:56 +00:00
scope :merged , - > { with_state ( :merged ) }
2013-04-25 14:15:33 +00:00
scope :by_branch , - > ( branch_name ) { where ( " (source_branch LIKE :branch) OR (target_branch LIKE :branch) " , branch : branch_name ) }
2013-02-20 13:37:20 +00:00
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 ) }
2013-04-25 14:15:33 +00:00
scope :in_projects , - > ( project_ids ) { where ( " source_project_id in (:project_ids) OR target_project_id in (:project_ids) " , project_ids : project_ids ) }
2013-08-08 14:29:31 +00:00
scope :of_projects , - > ( ids ) { where ( target_project_id : ids ) }
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
2013-04-25 14:15:33 +00:00
if target_project == source_project && target_branch == source_branch
errors . add :branch_conflict , " You can not use same project/branch for source and target "
2012-03-13 21:54:49 +00:00
end
2013-06-14 12:03:22 +00:00
2013-06-14 14:19:26 +00:00
if opened? || reopened?
2013-06-26 20:45:57 +00:00
similar_mrs = self . target_project . merge_requests . where ( source_branch : source_branch , target_branch : target_branch , source_project_id : source_project . id ) . opened
2013-06-14 14:19:26 +00:00
similar_mrs = similar_mrs . where ( 'id not in (?)' , self . id ) if self . id
2013-06-14 12:17:47 +00:00
2013-06-14 14:19:26 +00:00
if similar_mrs . any?
2013-06-26 20:45:57 +00:00
errors . add :base , " Cannot Create: This merge request already exists: #{ similar_mrs . pluck ( :title ) } "
2013-06-14 14:19:26 +00:00
end
2013-06-14 12:03:22 +00:00
end
2012-03-13 21:54:49 +00:00
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-07-08 17:12:35 +00:00
@diffs || = ( 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-05-22 06:50:09 +00:00
diffs == broken_diffs
2013-07-08 17:12:35 +00:00
rescue
true
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-08-08 09:22:09 +00:00
diffs = if for_fork?
Gitlab :: Satellite :: MergeAction . new ( author , self ) . diffs_between_satellite
else
2013-08-08 09:44:33 +00:00
Gitlab :: Git :: Diff . between ( target_project . repository , source_branch , target_branch )
2013-08-08 09:22:09 +00:00
end
2013-06-06 21:22:36 +00:00
diffs || = [ ]
2013-04-25 14:15:33 +00:00
diffs
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-04-25 14:15:33 +00:00
self . target_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-04-25 14:15:33 +00:00
self . target_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-07-16 21:14:03 +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
2013-04-25 14:15:33 +00:00
2012-03-14 22:57:43 +00:00
end
commits
end
def unmerged_commits
2013-07-16 21:14:03 +00:00
if for_fork?
commits = Gitlab :: Satellite :: MergeAction . new ( self . author , self ) . commits_between
else
commits = target_project . repository . commits_between ( self . target_branch , self . source_branch )
end
2013-08-08 09:44:33 +00:00
2013-04-25 14:15:33 +00:00
if commits . present?
commits = Commit . decorate ( commits ) .
2013-07-16 21:14:03 +00:00
sort_by ( & :created_at ) .
reverse
2013-04-25 14:15:33 +00:00
end
commits
2012-03-14 22:57:43 +00:00
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
2013-06-06 21:22:36 +00:00
2012-11-22 23:55:57 +00:00
# Returns the raw diff for this merge request
#
# see "git diff"
2013-04-25 14:15:33 +00:00
def to_diff ( current_user )
Gitlab :: Satellite :: MergeAction . new ( current_user , self ) . diff_in_satellite
2012-11-22 23:55:57 +00:00
end
# Returns the commit as a series of email patches.
#
# see "git format-patch"
2013-04-25 14:15:33 +00:00
def to_patch ( current_user )
Gitlab :: Satellite :: MergeAction . new ( current_user , self ) . format_patch
2012-11-22 23:55:57 +00:00
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
2013-04-25 14:15:33 +00:00
def for_fork?
target_project != source_project
end
def disallow_source_branch_removal?
( source_project . root_ref? source_branch ) || for_fork?
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 )
2013-05-22 11:06:08 +00:00
if diffs == broken_diffs
2013-05-22 06:50:09 +00:00
broken_diffs
2013-05-22 11:06:08 +00:00
elsif diffs . respond_to? ( :map )
2013-05-22 06:50:09 +00:00
diffs . map ( & :to_hash )
end
end
def load_diffs ( raw )
if raw == broken_diffs
broken_diffs
2013-05-22 11:06:08 +00:00
elsif raw . respond_to? ( :map )
2013-05-22 06:50:09 +00:00
raw . map { | hash | Gitlab :: Git :: Diff . new ( hash ) }
end
2013-04-15 16:01:36 +00:00
end
2013-05-22 06:50:09 +00:00
def broken_diffs
[ Gitlab :: Git :: Diff :: BROKEN_DIFF ]
2013-04-15 16:01:36 +00:00
end
2011-11-28 07:39:43 +00:00
end