Merge pull request #713 from gitlabhq/fast_automerge

Fast automerge

Merge pull request #713 from gitlabhq/fast_automerge
Fast automerge
Dmitriy Zaporozhets
2 parents 71819dc3 e5f8397f
Showing 5 changed files with 67 additions and 11 deletions Show diff stats
app/models/project/hooks_trait.rb
app/models/project/repository_trait.rb
lib/gitlab_merge.rb
lib/gitlabhq/satellite.rb
lib/tasks/gitlab/enable_automerge.rake
@@ -101,6 +101,9 @@ module Project::HooksTrait
  
       # Execute web hooks
       self.execute_web_hooks(oldrev, newrev, ref, user)
+
+      # Create satellite
+      self.satellite.create unless self.satellite.exists?
     end
   end
 end
@@ -37,6 +37,10 @@ module Project::RepositoryTrait
       end
     end
  
+    def satellite
+      @satellite ||= Gitlabhq::Satellite.new(self)
+    end
+
     def write_hook(name, content)
       hook_file = File.join(path_to_repo, 'hooks', name)
  
 class GitlabMerge
-  attr_accessor :project, :merge_path, :merge_request, :user
+  attr_accessor :project, :merge_request, :user
  
   def initialize(merge_request, user)
     self.user = user
     self.merge_request = merge_request
     self.project = merge_request.project
-    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|
+    process do |repo, output|
       !(output =~ /Automatic merge failed/)
     end
   end
  
   def merge
-    pull do |repo, output|
+    process do |repo, output|
       if output =~ /Automatic merge failed/
         false  
       else 
@@ -27,19 +24,23 @@ class GitlabMerge
     end
   end
  
-  def pull
+  def process
     Grit::Git.with_timeout(30.seconds) do 
       File.open(File.join(Rails.root, "tmp", "merge_repo", "#{project.path}.lock"), "w+") do |f|
         f.flock(File::LOCK_EX)
  
-        self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
-        unless File.exist?(self.merge_path)
-          raise "Gitlab user do not have access to repo. You should run: rake gitlab_enable_automerge"
+        unless project.satellite.exists?
+          raise "You should run: rake gitlab_enable_automerge"
         end
-        Dir.chdir(merge_path) do
+
+        project.satellite.clear
+
+        Dir.chdir(project.satellite.path) do
           merge_repo = Grit::Repo.new('.')
+          merge_repo.git.sh "git fetch origin"
           merge_repo.git.sh "git config user.name \"#{user.name}\""
           merge_repo.git.sh "git config user.email \"#{user.email}\""
+          merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
           output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
           yield(merge_repo, output)
         end
@@ -0,0 +1,41 @@
+module Gitlabhq
+  class Satellite
+    
+    PARKING_BRANCH = "__parking_branch"
+
+    attr_accessor :project
+
+    def initialize project
+      self.project = project
+    end
+
+    def create
+      `git clone #{project.url_to_repo} #{path}`
+    end
+
+    def path
+      File.join(Rails.root, "tmp", "repo_satellites", project.path)
+    end
+
+    def exists?
+      File.exists? path
+    end
+
+    #will be deleted all branches except PARKING_BRANCH
+    def clear
+      Dir.chdir(path) do
+        heads = Grit::Repo.new(".").heads.map{|head| head.name}
+        if heads.include? PARKING_BRANCH
+          `git checkout #{PARKING_BRANCH}`
+        else
+          `git checkout -b #{PARKING_BRANCH}`
+        end
+        heads.delete(PARKING_BRANCH)
+        heads.each do |head|
+          `git branch -D #{head}`
+        end
+      end
+    end
+    
+  end
+end
@@ -6,6 +6,13 @@ namespace :gitlab do
         git.admin_all_repo
       end
  
+      Project.find_each do |project|
+        if project.repo_exists? && !project.satellite.exists?
+          puts "Creating satellite for #{project.name}...".green
+          project.satellite.create
+        end
+      end
+
       puts "Done!".green
     end
   end
...	...	@@ -101,6 +101,9 @@ module Project::HooksTrait
101	101
102	102	# Execute web hooks
103	103	self.execute_web_hooks(oldrev, newrev, ref, user)
	104	+
	105	+ # Create satellite
	106	+ self.satellite.create unless self.satellite.exists?
104	107	end
105	108	end
106	109	end
...	...
...	...	@@ -37,6 +37,10 @@ module Project::RepositoryTrait
37	37	end
38	38	end
39	39
	40	+ def satellite
	41	+ @satellite \|\|= Gitlabhq::Satellite.new(self)
	42	+ end
	43	+
40	44	def write_hook(name, content)
41	45	hook_file = File.join(path_to_repo, 'hooks', name)
42	46
...	...
1	1	class GitlabMerge
2		- attr_accessor :project, :merge_path, :merge_request, :user
	2	+ attr_accessor :project, :merge_request, :user
3	3
4	4	def initialize(merge_request, user)
5	5	self.user = user
6	6	self.merge_request = merge_request
7	7	self.project = merge_request.project
8		- self.merge_path = File.join(Rails.root, "tmp", "merge_repo", project.path, merge_request.id.to_s)
9		- FileUtils.rm_rf(merge_path)
10		- FileUtils.mkdir_p merge_path
11	8	end
12	9
13	10	def can_be_merged?
14		- pull do \|repo, output\|
	11	+ process do \|repo, output\|
15	12	!(output =~ /Automatic merge failed/)
16	13	end
17	14	end
18	15
19	16	def merge
20		- pull do \|repo, output\|
	17	+ process do \|repo, output\|
21	18	if output =~ /Automatic merge failed/
22	19	false
23	20	else
...	...	@@ -27,19 +24,23 @@ class GitlabMerge
27	24	end
28	25	end
29	26
30		- def pull
	27	+ def process
31	28	Grit::Git.with_timeout(30.seconds) do
32	29	File.open(File.join(Rails.root, "tmp", "merge_repo", "#{project.path}.lock"), "w+") do \|f\|
33	30	f.flock(File::LOCK_EX)
34	31
35		- self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
36		- unless File.exist?(self.merge_path)
37		- raise "Gitlab user do not have access to repo. You should run: rake gitlab_enable_automerge"
	32	+ unless project.satellite.exists?
	33	+ raise "You should run: rake gitlab_enable_automerge"
38	34	end
39		- Dir.chdir(merge_path) do
	35	+
	36	+ project.satellite.clear
	37	+
	38	+ Dir.chdir(project.satellite.path) do
40	39	merge_repo = Grit::Repo.new('.')
	40	+ merge_repo.git.sh "git fetch origin"
41	41	merge_repo.git.sh "git config user.name \"#{user.name}\""
42	42	merge_repo.git.sh "git config user.email \"#{user.email}\""
	43	+ merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
43	44	output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
44	45	yield(merge_repo, output)
45	46	end
...	...
...	...	@@ -0,0 +1,41 @@
	1	+module Gitlabhq
	2	+ class Satellite
	3	+
	4	+ PARKING_BRANCH = "__parking_branch"
	5	+
	6	+ attr_accessor :project
	7	+
	8	+ def initialize project
	9	+ self.project = project
	10	+ end
	11	+
	12	+ def create
	13	+ `git clone #{project.url_to_repo} #{path}`
	14	+ end
	15	+
	16	+ def path
	17	+ File.join(Rails.root, "tmp", "repo_satellites", project.path)
	18	+ end
	19	+
	20	+ def exists?
	21	+ File.exists? path
	22	+ end
	23	+
	24	+ #will be deleted all branches except PARKING_BRANCH
	25	+ def clear
	26	+ Dir.chdir(path) do
	27	+ heads = Grit::Repo.new(".").heads.map{\|head\| head.name}
	28	+ if heads.include? PARKING_BRANCH
	29	+ `git checkout #{PARKING_BRANCH}`
	30	+ else
	31	+ `git checkout -b #{PARKING_BRANCH}`
	32	+ end
	33	+ heads.delete(PARKING_BRANCH)
	34	+ heads.each do \|head\|
	35	+ `git branch -D #{head}`
	36	+ end
	37	+ end
	38	+ end
	39	+
	40	+ end
	41	+end
...	...
...	...	@@ -6,6 +6,13 @@ namespace :gitlab do
6	6	git.admin_all_repo
7	7	end
8	8
	9	+ Project.find_each do \|project\|
	10	+ if project.repo_exists? && !project.satellite.exists?
	11	+ puts "Creating satellite for #{project.name}...".green
	12	+ project.satellite.create
	13	+ end
	14	+ end
	15	+
9	16	puts "Done!".green
10	17	end
11	18	end
...	...