Download as
Browse Code »

Commit dcbb875c46d59c4fba6d3554b87d6d9153791a66

Authored by Valery Sizov
1 parent ae565d24
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fast automerge: base implementation

Showing 4 changed files with 36 additions and 11 deletions   Show diff stats
app/models/project/hooks_trait.rb
  Diff comments   View file @dcbb875
... ... @@ -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 repo satellite
  106 + self.create_repo_satellite unless self.satellite_exists?
104 107 end
105 108 end
106 109 end
... ...
app/models/project/repository_trait.rb
  Diff comments   View file @dcbb875
... ... @@ -37,6 +37,23 @@ module Project::RepositoryTrait
37 37 end
38 38 end
39 39  
  40 + def path_to_repo_satellite
  41 + File.join(Rails.root, "tmp", "repo_satellites", self.path)
  42 + end
  43 +
  44 + def satellite_exists?
  45 + File.exist? path_to_repo_satellite
  46 + end
  47 +
  48 + def create_repo_satellite
  49 + `git clone #{url_to_repo} #{path_to_repo_satellite}`
  50 + Dir.chdir(path_to_repo_satellite) do
  51 + primary_branch = Grit::Repo.new(".").heads.first.name #usually it`s master
  52 + `git checkout -b __parking_branch`
  53 + `git branch -D #{primary_branch}`
  54 + end
  55 + end
  56 +
40 57 def write_hook(name, content)
41 58 hook_file = File.join(path_to_repo, 'hooks', name)
42 59  
... ...
lib/gitlab_merge.rb
  Diff comments   View file @dcbb875
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,20 @@ 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 + Dir.chdir(project.path_to_repo_satellite) do
40 36 merge_repo = Grit::Repo.new('.')
  37 + merge_repo.git.sh "git fetch origin"
41 38 merge_repo.git.sh "git config user.name \"#{user.name}\""
42 39 merge_repo.git.sh "git config user.email \"#{user.email}\""
  40 + merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
43 41 output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
44 42 yield(merge_repo, output)
45 43 end
... ...
lib/tasks/gitlab/enable_automerge.rake
  Diff comments   View file @dcbb875
... ... @@ -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.create_repo_satellite
  13 + end
  14 + end
  15 +
9 16 puts "Done!".green
10 17 end
11 18 end
... ...