deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Better merge handling. show if MR can be accepted or not

Browse source
This commit is contained in:
randx 2012-03-30 08:05:04 +03:00
parent cd74f9da91
commit 411d84f385
6 changed files with 84 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/gitlab_merge.rb
View file

@ -4,23 +4,34 @@ class GitlabMerge
def initialize(merge_request)
self.merge_request = merge_request
self.project = merge_request.project
self.merge_path = File.join(Rails.root, "tmp", "merge_repo", project.path)
self.merge_path = File.join(Rails.root, "tmp", "merge_repo", project.path, merge_request.id.to_s)
FileUtils.rm_rf(merge_path)
FileUtils.mkdir_p merge_path
end
def can_be_merged?
pull do |repo, output|
!(output =~ /Automatic merge failed/)
end
end
def merge
self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
output = ""
Dir.chdir(merge_path) do
merge_repo = Grit::Repo.new('.')
output = merge_repo.git.pull({}, "origin", merge_request.source_branch)
pull do |repo, output|
if output =~ /Automatic merge failed/
return false
false
else
merge_repo.git.push({}, "origin", merge_request.target_branch)
return true
repo.git.push({}, "origin", merge_request.target_branch)
true
end
end
end
def pull
self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
Dir.chdir(merge_path) do
merge_repo = Grit::Repo.new('.')
output = merge_repo.git.pull({}, "origin", merge_request.source_branch)
yield(merge_repo, output)
end
end
end