2012-03-14 23:57:43 +01:00
|
|
|
require File.join(Rails.root, "app/models/commit")
|
|
|
|
|
2011-11-28 08:39:43 +01:00
|
|
|
class MergeRequest < ActiveRecord::Base
|
2012-08-09 03:26:56 +02:00
|
|
|
include IssueCommonality
|
2012-06-07 14:44:57 +02:00
|
|
|
include Upvote
|
|
|
|
|
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-08-09 03:40:57 +02:00
|
|
|
attr_accessor :should_remove_source_branch
|
2011-11-28 08:39:43 +01:00
|
|
|
|
|
|
|
validates_presence_of :source_branch
|
|
|
|
validates_presence_of :target_branch
|
2012-03-13 22:54:49 +01:00
|
|
|
validate :validate_branches
|
2011-11-28 08:39:43 +01:00
|
|
|
|
2012-03-16 00:45:46 +01:00
|
|
|
def self.find_all_by_branch(branch_name)
|
2012-08-11 00:07:50 +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-04-16 21:08:03 +02: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 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?
|
|
|
|
state == UNCHECKED
|
|
|
|
end
|
|
|
|
|
2012-03-30 07:15:04 +02:00
|
|
|
def mark_as_unchecked
|
2012-08-11 00:07:50 +02:00
|
|
|
self.update_attributes(state: UNCHECKED)
|
2012-03-30 07:15:04 +02:00
|
|
|
end
|
|
|
|
|
2012-03-29 23:27:42 +02:00
|
|
|
def can_be_merged?
|
2012-03-30 07:05:04 +02:00
|
|
|
state == CAN_BE_MERGED
|
|
|
|
end
|
|
|
|
|
|
|
|
def check_if_can_be_merged
|
2012-05-26 12:37:49 +02:00
|
|
|
self.state = if Gitlab::Merge.new(self, self.author).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
|
|
|
|
if open? && unmerged_diffs.any?
|
|
|
|
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
|
2011-11-29 19:06:37 +01:00
|
|
|
commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
|
2012-07-17 07:23:16 +02:00
|
|
|
diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
|
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-08-09 03:40:57 +02:00
|
|
|
def merged?
|
2012-03-16 00:45:46 +01:00
|
|
|
merged && merge_event
|
|
|
|
end
|
|
|
|
|
2012-03-15 22:32:00 +01:00
|
|
|
def merge_event
|
2012-08-11 00:07:50 +02: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
|
2012-08-11 00:07:50 +02: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? &&
|
2012-03-14 23:57:43 +01:00
|
|
|
commits.any? && open?
|
|
|
|
end
|
|
|
|
|
|
|
|
def open?
|
|
|
|
!closed
|
|
|
|
end
|
|
|
|
|
|
|
|
def mark_as_merged!
|
|
|
|
self.merged = true
|
|
|
|
self.closed = true
|
|
|
|
save
|
2012-03-29 23:27:42 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
def mark_as_unmergable
|
2012-08-11 00:07:50 +02:00
|
|
|
self.update_attributes state: CANNOT_BE_MERGED
|
2012-03-14 23:57:43 +01:00
|
|
|
end
|
|
|
|
|
2012-08-09 03:40:57 +02:00
|
|
|
def reloaded_commits
|
|
|
|
if open? && 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)
|
|
|
|
self.mark_as_merged!
|
|
|
|
Event.create(
|
2012-08-11 00:07:50 +02:00
|
|
|
project: self.project,
|
|
|
|
action: Event::Merged,
|
|
|
|
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-05-26 12:37:49 +02:00
|
|
|
if Gitlab::Merge.new(self, current_user).merge
|
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
|
|
|
|
|
|
|
def to_raw
|
|
|
|
FileUtils.mkdir_p(Rails.root.join("tmp", "patches"))
|
|
|
|
patch_path = Rails.root.join("tmp", "patches", "merge_request_#{self.id}.patch")
|
|
|
|
|
|
|
|
from = commits.last.id
|
|
|
|
to = source_branch
|
|
|
|
|
|
|
|
project.repo.git.run('', "format-patch" , " > #{patch_path.to_s}", {}, ["#{from}..#{to}", "--stdout"])
|
|
|
|
|
|
|
|
patch_path
|
|
|
|
end
|
2011-11-28 08:39:43 +01:00
|
|
|
end
|
2011-12-18 15:09:16 +01:00
|
|
|
# == Schema Information
|
|
|
|
#
|
|
|
|
# Table name: merge_requests
|
|
|
|
#
|
2012-06-26 20:23:09 +02:00
|
|
|
# id :integer(4) not null, primary key
|
2011-12-18 15:09:16 +01:00
|
|
|
# target_branch :string(255) not null
|
|
|
|
# source_branch :string(255) not null
|
2012-06-26 20:23:09 +02:00
|
|
|
# project_id :integer(4) not null
|
|
|
|
# author_id :integer(4)
|
|
|
|
# assignee_id :integer(4)
|
2011-12-18 15:09:16 +01:00
|
|
|
# title :string(255)
|
2012-06-26 20:23:09 +02:00
|
|
|
# closed :boolean(1) default(FALSE), not null
|
|
|
|
# created_at :datetime not null
|
|
|
|
# updated_at :datetime not null
|
|
|
|
# st_commits :text(2147483647
|
|
|
|
# st_diffs :text(2147483647
|
|
|
|
# merged :boolean(1) default(FALSE), not null
|
|
|
|
# state :integer(4) default(1), not null
|
2011-12-18 15:09:16 +01:00
|
|
|
#
|
|
|
|
|