Merge remote-tracking branch 'origin/merge_button'

Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb

Merge remote-tracking branch 'origin/merge_button'
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb
Dmitriy Zaporozhets
2 parents 9af14e4b 3a6694b5
Showing 13 changed files with 223 additions and 7 deletions Show diff stats
app/assets/javascripts/merge_requests.js
app/controllers/merge_requests_controller.rb
app/models/ability.rb
app/models/merge_request.rb
app/models/project/hooks_trait.rb
app/views/merge_requests/automerge.js.haml
app/views/merge_requests/show.html.haml
config/routes.rb
db/migrate/20120329170745_add_automerge_to_merge_request.rb
db/schema.rb
lib/gitlab_merge.rb
lib/gitlabhq/gitolite.rb
lib/tasks/gitlab_enable_automerge.rake
 var MergeRequest = { 
   diffs_loaded: false,
   commits_loaded: false,
+  opts: false,
  
   init:
-    function() { 
+    function(opts) {
+      this.opts = opts;
+
+      if($(".automerge_widget").length){
+        $.get(opts.url_to_automerge_check, function(data){
+          $(".automerge_widget").hide();
+          $(".automerge_widget." + data.state).show();
+        }, "json");
+      }
+
       $(".nav-tabs a").live("click", function() { 
         $(".nav-tabs a").parent().removeClass("active");
         $(this).parent().addClass("active");
@@ -44,5 +54,11 @@ var MergeRequest = {
     function() { 
       $(".first_mr_commits").remove();
       $(".all_mr_commits").removeClass("hide");
+    },
+
+  already_cannot_be_merged:
+    function(){
+        $(".automerge_widget").hide();
+        $(".automerge_widget.already_cannot_be_merged").show();
     }
 }
@@ -2,7 +2,7 @@ class MergeRequestsController &lt; ApplicationController
   before_filter :authenticate_user!
   before_filter :project
   before_filter :module_enabled
-  before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs]
+  before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
   layout "project"
  
   # Authorize
@@ -89,6 +89,7 @@ class MergeRequestsController &lt; ApplicationController
     respond_to do |format|
       if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
         @merge_request.reload_code
+        @merge_request.mark_as_unchecked
         format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' }
         format.json { head :ok }
       else
@@ -98,6 +99,23 @@ class MergeRequestsController &lt; ApplicationController
     end
   end
  
+  def automerge_check
+    if @merge_request.unchecked? 
+      @merge_request.check_if_can_be_merged
+    end
+    render :json => {:state => @merge_request.human_state}
+  end
+
+  def automerge
+    return access_denied! unless can?(current_user, :accept_mr, @project)
+    if @merge_request.open? && @merge_request.can_be_merged?
+      @merge_request.automerge!(current_user)
+      @status = true
+    else
+      @status = false
+    end
+  end
+
   def destroy
     @merge_request.destroy
  
@@ -48,6 +48,7 @@ class Ability
       :admin_team_member,
       :admin_merge_request,
       :admin_note,
+      :accept_mr,
       :admin_wiki
     ] if project.master_access_for?(user) || project.owner == user
  
 require File.join(Rails.root, "app/models/commit")
  
 class MergeRequest < ActiveRecord::Base
+  UNCHECKED = 1
+  CAN_BE_MERGED = 2
+  CANNOT_BE_MERGED = 3
+
   belongs_to :project
   belongs_to :author, :class_name => "User"
   belongs_to :assignee, :class_name => "User"
@@ -45,6 +49,15 @@ class MergeRequest &lt; ActiveRecord::Base
     where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
   end
  
+  def human_state
+    states = {
+      CAN_BE_MERGED =>  "can_be_merged",
+      CANNOT_BE_MERGED => "cannot_be_merged",
+      UNCHECKED => "unchecked"
+    }
+    states[self.state]
+  end
+
   def validate_branches
     if target_branch == source_branch
       errors.add :base, "You can not use same branch for source and target branches"
@@ -56,6 +69,27 @@ class MergeRequest &lt; ActiveRecord::Base
     self.reloaded_diffs
   end
  
+  def unchecked?
+    state == UNCHECKED
+  end
+
+  def mark_as_unchecked
+    self.update_attributes(:state => UNCHECKED)
+  end
+
+  def can_be_merged?
+    state == CAN_BE_MERGED
+  end
+
+  def check_if_can_be_merged
+    self.state = if GitlabMerge.new(self, self.author).can_be_merged?
+                   CAN_BE_MERGED
+                 else
+                   CANNOT_BE_MERGED
+                 end
+    self.save
+  end
+
   def new?
     today? && created_at == updated_at
   end
@@ -118,6 +152,10 @@ class MergeRequest &lt; ActiveRecord::Base
     save
   end
  
+  def mark_as_unmergable
+    self.update_attributes :state => CANNOT_BE_MERGED
+  end
+
   def reloaded_commits 
     if open? && unmerged_commits.any? 
       self.st_commits = unmerged_commits
@@ -144,6 +182,16 @@ class MergeRequest &lt; ActiveRecord::Base
       :author_id => user_id
     )
   end
+
+  def automerge!(current_user)
+    if GitlabMerge.new(self, current_user).merge
+      self.merge!(current_user.id)
+      true
+    end
+  rescue 
+    self.mark_as_unmergable
+    false
+  end
 end
 # == Schema Information
 #
@@ -18,7 +18,7 @@ module Project::HooksTrait
  
       # Update code for merge requests
       mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
-      mrs.each { |merge_request| merge_request.reload_code }
+      mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
  
       # Close merge requests
       mrs = self.merge_requests.opened.where(:target_branch => branch_name).all
@@ -0,0 +1,7 @@
+-if @status
+  :plain
+    location.reload();
+-else
+  :plain
+    MergeRequest.already_cannot_be_merged()
+
@@ -8,7 +8,6 @@
   %span.right
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
-        = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
         = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do 
           Edit
@@ -53,6 +52,34 @@
           Closed by #{@merge_request.closed_event.author_name} 
           %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
  
+
+- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
+  .automerge_widget.can_be_merged{:style => "display:none"}
+    .ui-box.padded
+      %p 
+        You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
+      = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
+      &nbsp;
+      
+  .automerge_widget.cannot_be_merged{:style => "display:none"}
+    .alert-message
+      %p
+        %strong This request cant be merged with GitLab. You should do it manually &nbsp;
+        = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
+  
+  .automerge_widget.unchecked
+    .alert-message
+      %p
+        %strong Checking for ability to automatically merge… 
+  
+  .automerge_widget.already_cannot_be_merged{:style => "display:none"}
+    .alert-message
+      %p
+        %strong This merge request already can not be merged
+
+
+
+
 = render "merge_requests/commits"
  
 - unless @commits.empty?
@@ -72,7 +99,13 @@
  
 :javascript
   $(function(){
-    MergeRequest.init();
+    MergeRequest.init({
+      url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
+    });
+
+    $(".accept_merge_request").live("ajax:beforeSend", function() {
+      $(this).replaceWith('#{image_tag "ajax_loader.gif"}');
+    })
   })
  
 = render "notes/per_line_form"
@@ -100,6 +100,8 @@ Gitlab::Application.routes.draw do
     resources :merge_requests do 
       member do 
         get :diffs
+        get :automerge
+        get :automerge_check
       end
  
       collection do 
@@ -0,0 +1,5 @@
+class AddAutomergeToMergeRequest < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :state, :integer, :null => false, :default => 1
+  end
+end
@@ -11,8 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20120413135904) do
-
+ActiveRecord::Schema.define(:version => 20120329170745) do
   create_table "events", :force => true do |t|
     t.string   "target_type"
     t.integer  "target_id"
@@ -65,6 +64,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120413135904) do
     t.text     "st_commits",    :limit => 2147483647
     t.text     "st_diffs",      :limit => 2147483647
     t.boolean  "merged",                              :default => false, :null => false
+    t.boolean  "auto_merge",    :default => true,  :null => false
   end
  
   add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
@@ -0,0 +1,48 @@
+class GitlabMerge
+  attr_accessor :project, :merge_path, :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|
+      !(output =~ /Automatic merge failed/)
+    end
+  end
+
+  def merge
+    pull do |repo, output|
+      if output =~ /Automatic merge failed/
+        false  
+      else 
+        repo.git.push({}, "origin", merge_request.target_branch)
+        true
+      end
+    end
+  end
+
+  def pull
+    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"
+      end
+      Dir.chdir(merge_path) do
+        merge_repo = Grit::Repo.new('.')
+        merge_repo.git.sh "git config user.name \"#{user.name}\""
+        merge_repo.git.sh "git config user.email \"#{user.email}\""
+        output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
+        yield(merge_repo, output)
+      end
+
+    end
+  end
+end
@@ -123,5 +123,34 @@ module Gitlabhq
  
       repo
     end
+
+    def admin_all_repo
+      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
+      conf = ga_repo.config
+      owner_name = ""
+
+      # Read gitolite-admin user
+      #
+      begin 
+        repo = conf.get_repo("gitolite-admin")
+        owner_name = repo.permissions[0]["RW+"][""][0]
+        raise StandardError if owner_name.blank?
+      rescue => ex
+        puts "Cant determine gitolite-admin owner".red
+        raise StandardError
+      end
+
+      # @ALL repos premission for gitolite owner
+      repo_name = "@all"
+      repo = if conf.has_repo?(repo_name)
+               conf.get_repo(repo_name)
+             else 
+               ::Gitolite::Config::Repo.new(repo_name)
+             end
+
+      repo.add_permission("RW+", "", owner_name)
+      conf.add_repo(repo, true)
+      ga_repo.save
+    end
   end
 end
@@ -0,0 +1,9 @@
+desc "Give gitlab user full access to every repo"
+task :gitlab_enable_automerge => :environment  do
+
+  Gitlabhq::GitHost.system.new.configure do |git|
+    git.admin_all_repo
+  end
+
+  puts "Done!".green
+end
1	1	var MergeRequest = {
2	2	diffs_loaded: false,
3	3	commits_loaded: false,
	4	+ opts: false,
4	5
5	6	init:
6		- function() {
	7	+ function(opts) {
	8	+ this.opts = opts;
	9	+
	10	+ if($(".automerge_widget").length){
	11	+ $.get(opts.url_to_automerge_check, function(data){
	12	+ $(".automerge_widget").hide();
	13	+ $(".automerge_widget." + data.state).show();
	14	+ }, "json");
	15	+ }
	16	+
7	17	$(".nav-tabs a").live("click", function() {
8	18	$(".nav-tabs a").parent().removeClass("active");
9	19	$(this).parent().addClass("active");
...	...	@@ -44,5 +54,11 @@ var MergeRequest = {
44	54	function() {
45	55	$(".first_mr_commits").remove();
46	56	$(".all_mr_commits").removeClass("hide");
	57	+ },
	58	+
	59	+ already_cannot_be_merged:
	60	+ function(){
	61	+ $(".automerge_widget").hide();
	62	+ $(".automerge_widget.already_cannot_be_merged").show();
47	63	}
48	64	}
...	...
...	...	@@ -2,7 +2,7 @@ class MergeRequestsController < ApplicationController
2	2	before_filter :authenticate_user!
3	3	before_filter :project
4	4	before_filter :module_enabled
5		- before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs]
	5	+ before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
6	6	layout "project"
7	7
8	8	# Authorize
...	...	@@ -89,6 +89,7 @@ class MergeRequestsController < ApplicationController
89	89	respond_to do \|format\|
90	90	if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
91	91	@merge_request.reload_code
	92	+ @merge_request.mark_as_unchecked
92	93	format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' }
93	94	format.json { head :ok }
94	95	else
...	...	@@ -98,6 +99,23 @@ class MergeRequestsController < ApplicationController
98	99	end
99	100	end
100	101
	102	+ def automerge_check
	103	+ if @merge_request.unchecked?
	104	+ @merge_request.check_if_can_be_merged
	105	+ end
	106	+ render :json => {:state => @merge_request.human_state}
	107	+ end
	108	+
	109	+ def automerge
	110	+ return access_denied! unless can?(current_user, :accept_mr, @project)
	111	+ if @merge_request.open? && @merge_request.can_be_merged?
	112	+ @merge_request.automerge!(current_user)
	113	+ @status = true
	114	+ else
	115	+ @status = false
	116	+ end
	117	+ end
	118	+
101	119	def destroy
102	120	@merge_request.destroy
103	121
...	...
...	...	@@ -48,6 +48,7 @@ class Ability
48	48	:admin_team_member,
49	49	:admin_merge_request,
50	50	:admin_note,
	51	+ :accept_mr,
51	52	:admin_wiki
52	53	] if project.master_access_for?(user) \|\| project.owner == user
53	54
...	...
1	1	require File.join(Rails.root, "app/models/commit")
2	2
3	3	class MergeRequest < ActiveRecord::Base
	4	+ UNCHECKED = 1
	5	+ CAN_BE_MERGED = 2
	6	+ CANNOT_BE_MERGED = 3
	7	+
4	8	belongs_to :project
5	9	belongs_to :author, :class_name => "User"
6	10	belongs_to :assignee, :class_name => "User"
...	...	@@ -45,6 +49,15 @@ class MergeRequest < ActiveRecord::Base
45	49	where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
46	50	end
47	51
	52	+ def human_state
	53	+ states = {
	54	+ CAN_BE_MERGED => "can_be_merged",
	55	+ CANNOT_BE_MERGED => "cannot_be_merged",
	56	+ UNCHECKED => "unchecked"
	57	+ }
	58	+ states[self.state]
	59	+ end
	60	+
48	61	def validate_branches
49	62	if target_branch == source_branch
50	63	errors.add :base, "You can not use same branch for source and target branches"
...	...	@@ -56,6 +69,27 @@ class MergeRequest < ActiveRecord::Base
56	69	self.reloaded_diffs
57	70	end
58	71
	72	+ def unchecked?
	73	+ state == UNCHECKED
	74	+ end
	75	+
	76	+ def mark_as_unchecked
	77	+ self.update_attributes(:state => UNCHECKED)
	78	+ end
	79	+
	80	+ def can_be_merged?
	81	+ state == CAN_BE_MERGED
	82	+ end
	83	+
	84	+ def check_if_can_be_merged
	85	+ self.state = if GitlabMerge.new(self, self.author).can_be_merged?
	86	+ CAN_BE_MERGED
	87	+ else
	88	+ CANNOT_BE_MERGED
	89	+ end
	90	+ self.save
	91	+ end
	92	+
59	93	def new?
60	94	today? && created_at == updated_at
61	95	end
...	...	@@ -118,6 +152,10 @@ class MergeRequest < ActiveRecord::Base
118	152	save
119	153	end
120	154
	155	+ def mark_as_unmergable
	156	+ self.update_attributes :state => CANNOT_BE_MERGED
	157	+ end
	158	+
121	159	def reloaded_commits
122	160	if open? && unmerged_commits.any?
123	161	self.st_commits = unmerged_commits
...	...	@@ -144,6 +182,16 @@ class MergeRequest < ActiveRecord::Base
144	182	:author_id => user_id
145	183	)
146	184	end
	185	+
	186	+ def automerge!(current_user)
	187	+ if GitlabMerge.new(self, current_user).merge
	188	+ self.merge!(current_user.id)
	189	+ true
	190	+ end
	191	+ rescue
	192	+ self.mark_as_unmergable
	193	+ false
	194	+ end
147	195	end
148	196	# == Schema Information
149	197	#
...	...
...	...	@@ -18,7 +18,7 @@ module Project::HooksTrait
18	18
19	19	# Update code for merge requests
20	20	mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
21		- mrs.each { \|merge_request\| merge_request.reload_code }
	21	+ mrs.each { \|merge_request\| merge_request.reload_code; merge_request.mark_as_unchecked }
22	22
23	23	# Close merge requests
24	24	mrs = self.merge_requests.opened.where(:target_branch => branch_name).all
...	...
...	...	@@ -0,0 +1,7 @@
	1	+-if @status
	2	+ :plain
	3	+ location.reload();
	4	+-else
	5	+ :plain
	6	+ MergeRequest.already_cannot_be_merged()
	7	+
...	...
...	...	@@ -8,7 +8,6 @@
8	8	%span.right
9	9	- if can?(current_user, :modify_merge_request, @merge_request)
10	10	- if @merge_request.open?
11		- = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
12	11	= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
13	12	= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
14	13	Edit
...	...	@@ -53,6 +52,34 @@
53	52	Closed by #{@merge_request.closed_event.author_name}
54	53	%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
55	54
	55	+
	56	+- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
	57	+ .automerge_widget.can_be_merged{:style => "display:none"}
	58	+ .ui-box.padded
	59	+ %p
	60	+ You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
	61	+ = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
	62	+
	63	+
	64	+ .automerge_widget.cannot_be_merged{:style => "display:none"}
	65	+ .alert-message
	66	+ %p
	67	+ %strong This request cant be merged with GitLab. You should do it manually
	68	+ = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
	69	+
	70	+ .automerge_widget.unchecked
	71	+ .alert-message
	72	+ %p
	73	+ %strong Checking for ability to automatically merge…
	74	+
	75	+ .automerge_widget.already_cannot_be_merged{:style => "display:none"}
	76	+ .alert-message
	77	+ %p
	78	+ %strong This merge request already can not be merged
	79	+
	80	+
	81	+
	82	+
56	83	= render "merge_requests/commits"
57	84
58	85	- unless @commits.empty?
...	...	@@ -72,7 +99,13 @@
72	99
73	100	:javascript
74	101	$(function(){
75		- MergeRequest.init();
	102	+ MergeRequest.init({
	103	+ url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
	104	+ });
	105	+
	106	+ $(".accept_merge_request").live("ajax:beforeSend", function() {
	107	+ $(this).replaceWith('#{image_tag "ajax_loader.gif"}');
	108	+ })
76	109	})
77	110
78	111	= render "notes/per_line_form"
...	...
...	...	@@ -100,6 +100,8 @@ Gitlab::Application.routes.draw do
100	100	resources :merge_requests do
101	101	member do
102	102	get :diffs
	103	+ get :automerge
	104	+ get :automerge_check
103	105	end
104	106
105	107	collection do
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class AddAutomergeToMergeRequest < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :merge_requests, :state, :integer, :null => false, :default => 1
	4	+ end
	5	+end
...	...
...	...	@@ -11,8 +11,7 @@
11	11	#
12	12	# It's strongly recommended to check this file into your version control system.
13	13
14		-ActiveRecord::Schema.define(:version => 20120413135904) do
15		-
	14	+ActiveRecord::Schema.define(:version => 20120329170745) do
16	15	create_table "events", :force => true do \|t\|
17	16	t.string "target_type"
18	17	t.integer "target_id"
...	...	@@ -65,6 +64,7 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
65	64	t.text "st_commits", :limit => 2147483647
66	65	t.text "st_diffs", :limit => 2147483647
67	66	t.boolean "merged", :default => false, :null => false
	67	+ t.boolean "auto_merge", :default => true, :null => false
68	68	end
69	69
70	70	add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
...	...