Merge pull request #1375 from tsigo/discover_default_branch
Default branch auto-discovery
This commit is contained in:
commit
6e5cd8e081
|
@ -120,16 +120,6 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_refs
|
|
||||||
if params[:ref].blank?
|
|
||||||
@branch = params[:branch].blank? ? nil : params[:branch]
|
|
||||||
@tag = params[:tag].blank? ? nil : params[:tag]
|
|
||||||
@ref = @branch || @tag || @project.try(:default_branch) || Repository.default_ref
|
|
||||||
else
|
|
||||||
@ref = params[:ref]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_404
|
def render_404
|
||||||
render file: File.join(Rails.root, "public", "404"), layout: false, status: "404"
|
render file: File.join(Rails.root, "public", "404"), layout: false, status: "404"
|
||||||
end
|
end
|
||||||
|
|
|
@ -67,4 +67,16 @@ class CommitsController < ApplicationController
|
||||||
filename: (@commit.id.to_s + ".patch")
|
filename: (@commit.id.to_s + ".patch")
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
protected
|
||||||
|
|
||||||
|
def load_refs
|
||||||
|
if params[:ref].blank?
|
||||||
|
@branch = params[:branch].blank? ? nil : params[:branch]
|
||||||
|
@tag = params[:tag].blank? ? nil : params[:tag]
|
||||||
|
@ref = @branch || @tag || @project.try(:default_branch) || 'master'
|
||||||
|
else
|
||||||
|
@ref = params[:ref]
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -187,7 +187,7 @@ end
|
||||||
# private_flag :boolean(1) default(TRUE), not null
|
# private_flag :boolean(1) default(TRUE), not null
|
||||||
# code :string(255)
|
# code :string(255)
|
||||||
# owner_id :integer(4)
|
# owner_id :integer(4)
|
||||||
# default_branch :string(255) default("master"), not null
|
# default_branch :string(255)
|
||||||
# issues_enabled :boolean(1) default(TRUE), not null
|
# issues_enabled :boolean(1) default(TRUE), not null
|
||||||
# wall_enabled :boolean(1) default(TRUE), not null
|
# wall_enabled :boolean(1) default(TRUE), not null
|
||||||
# merge_requests_enabled :boolean(1) default(TRUE), not null
|
# merge_requests_enabled :boolean(1) default(TRUE), not null
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Includes methods for handling Git Push events
|
||||||
|
#
|
||||||
|
# Triggered by PostReceive job
|
||||||
module PushObserver
|
module PushObserver
|
||||||
def observe_push(oldrev, newrev, ref, user)
|
def observe_push(oldrev, newrev, ref, user)
|
||||||
data = post_receive_data(oldrev, newrev, ref, user)
|
data = post_receive_data(oldrev, newrev, ref, user)
|
||||||
|
@ -84,11 +87,10 @@ module PushObserver
|
||||||
data
|
data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# This method will be called after each post receive and only if the provided
|
||||||
# This method will be called after each post receive
|
# user is present in GitLab.
|
||||||
# and only if user present in gitlab.
|
|
||||||
# All callbacks for post receive should be placed here
|
|
||||||
#
|
#
|
||||||
|
# All callbacks for post receive should be placed here.
|
||||||
def trigger_post_receive(oldrev, newrev, ref, user)
|
def trigger_post_receive(oldrev, newrev, ref, user)
|
||||||
# Create push event
|
# Create push event
|
||||||
self.observe_push(oldrev, newrev, ref, user)
|
self.observe_push(oldrev, newrev, ref, user)
|
||||||
|
@ -101,5 +103,11 @@ module PushObserver
|
||||||
|
|
||||||
# Create satellite
|
# Create satellite
|
||||||
self.satellite.create unless self.satellite.exists?
|
self.satellite.create unless self.satellite.exists?
|
||||||
|
|
||||||
|
# Discover the default branch, but only if it hasn't already been set to
|
||||||
|
# something else
|
||||||
|
if default_branch.nil?
|
||||||
|
update_attributes(default_branch: discover_default_branch)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -94,6 +94,24 @@ module Repository
|
||||||
end.sort_by(&:name)
|
end.sort_by(&:name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Discovers the default branch based on the repository's available branches
|
||||||
|
#
|
||||||
|
# - If no branches are present, returns nil
|
||||||
|
# - If one branch is present, returns its name
|
||||||
|
# - If two or more branches are present, returns the one that has a name
|
||||||
|
# matching root_ref (default_branch or 'master' if default_branch is nil)
|
||||||
|
def discover_default_branch
|
||||||
|
branches = heads.collect(&:name)
|
||||||
|
|
||||||
|
if branches.length == 0
|
||||||
|
nil
|
||||||
|
elsif branches.length == 1
|
||||||
|
branches.first
|
||||||
|
else
|
||||||
|
branches.select { |v| v == root_ref }.first
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def has_commits?
|
def has_commits?
|
||||||
!!commit
|
!!commit
|
||||||
end
|
end
|
||||||
|
@ -102,7 +120,7 @@ module Repository
|
||||||
default_branch || "master"
|
default_branch || "master"
|
||||||
end
|
end
|
||||||
|
|
||||||
def root_ref? branch
|
def root_ref?(branch)
|
||||||
root_ref == branch
|
root_ref == branch
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -111,7 +129,7 @@ module Repository
|
||||||
# Already packed repo archives stored at
|
# Already packed repo archives stored at
|
||||||
# app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
|
# app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
|
||||||
#
|
#
|
||||||
def archive_repo ref
|
def archive_repo(ref)
|
||||||
ref = ref || self.root_ref
|
ref = ref || self.root_ref
|
||||||
commit = self.commit(ref)
|
commit = self.commit(ref)
|
||||||
return nil unless commit
|
return nil unless commit
|
||||||
|
@ -138,6 +156,6 @@ module Repository
|
||||||
end
|
end
|
||||||
|
|
||||||
def http_url_to_repo
|
def http_url_to_repo
|
||||||
http_url = [Gitlab.config.url, "/", path, ".git"].join()
|
http_url = [Gitlab.config.url, "/", path, ".git"].join('')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
class SetDefaultBranchDefaultToNil < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
# Set the default_branch to allow nil, and default it to nil
|
||||||
|
change_column_null(:projects, :default_branch, true)
|
||||||
|
change_column_default(:projects, :default_branch, nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
change_column_null(:projects, :default_branch, false)
|
||||||
|
change_column_default(:projects, :default_branch, 'master')
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20120729131232) do
|
ActiveRecord::Schema.define(:version => 20120905043334) do
|
||||||
|
|
||||||
create_table "events", :force => true do |t|
|
create_table "events", :force => true do |t|
|
||||||
t.string "target_type"
|
t.string "target_type"
|
||||||
|
@ -103,7 +103,7 @@ ActiveRecord::Schema.define(:version => 20120729131232) do
|
||||||
t.boolean "private_flag", :default => true, :null => false
|
t.boolean "private_flag", :default => true, :null => false
|
||||||
t.string "code"
|
t.string "code"
|
||||||
t.integer "owner_id"
|
t.integer "owner_id"
|
||||||
t.string "default_branch", :default => "master", :null => false
|
t.string "default_branch"
|
||||||
t.boolean "issues_enabled", :default => true, :null => false
|
t.boolean "issues_enabled", :default => true, :null => false
|
||||||
t.boolean "wall_enabled", :default => true, :null => false
|
t.boolean "wall_enabled", :default => true, :null => false
|
||||||
t.boolean "merge_requests_enabled", :default => true, :null => false
|
t.boolean "merge_requests_enabled", :default => true, :null => false
|
||||||
|
|
|
@ -19,4 +19,54 @@ describe Project, "Repository" do
|
||||||
project.should_not be_empty_repo
|
project.should_not be_empty_repo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "#discover_default_branch" do
|
||||||
|
let(:master) { double(name: 'master') }
|
||||||
|
let(:stable) { double(name: 'stable') }
|
||||||
|
|
||||||
|
it "returns 'master' when master exists" do
|
||||||
|
project.should_receive(:heads).and_return([stable, master])
|
||||||
|
project.discover_default_branch.should == 'master'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns non-master when master exists but default branch is set to something else" do
|
||||||
|
project.default_branch = 'stable'
|
||||||
|
project.should_receive(:heads).and_return([stable, master])
|
||||||
|
project.discover_default_branch.should == 'stable'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns a non-master branch when only one exists" do
|
||||||
|
project.should_receive(:heads).and_return([stable])
|
||||||
|
project.discover_default_branch.should == 'stable'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns nil when no branch exists" do
|
||||||
|
project.should_receive(:heads).and_return([])
|
||||||
|
project.discover_default_branch.should be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "#root_ref" do
|
||||||
|
it "returns default_branch when set" do
|
||||||
|
project.default_branch = 'stable'
|
||||||
|
project.root_ref.should == 'stable'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns 'master' when default_branch is nil" do
|
||||||
|
project.default_branch = nil
|
||||||
|
project.root_ref.should == 'master'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "#root_ref?" do
|
||||||
|
it "returns true when branch is root_ref" do
|
||||||
|
project.default_branch = 'stable'
|
||||||
|
project.root_ref?('stable').should be_true
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns false when branch is not root_ref" do
|
||||||
|
project.default_branch = nil
|
||||||
|
project.root_ref?('stable').should be_false
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue