2015-08-14 10:23:40 -04:00
|
|
|
require 'securerandom'
|
|
|
|
|
2013-03-31 16:45:38 -04:00
|
|
|
class Repository
|
2015-08-14 10:23:40 -04:00
|
|
|
class PreReceiveError < StandardError; end
|
|
|
|
class CommitError < StandardError; end
|
|
|
|
|
2013-07-16 15:19:07 -04:00
|
|
|
include Gitlab::ShellAdapter
|
|
|
|
|
2015-04-21 09:09:15 -04:00
|
|
|
attr_accessor :raw_repository, :path_with_namespace, :project
|
2013-03-31 16:45:38 -04:00
|
|
|
|
2015-04-21 09:09:15 -04:00
|
|
|
def initialize(path_with_namespace, default_branch = nil, project = nil)
|
2013-10-01 10:00:28 -04:00
|
|
|
@path_with_namespace = path_with_namespace
|
2015-04-21 09:09:15 -04:00
|
|
|
@project = project
|
2015-06-20 08:34:32 -04:00
|
|
|
|
|
|
|
if path_with_namespace
|
2015-07-01 05:02:37 -04:00
|
|
|
@raw_repository = Gitlab::Git::Repository.new(path_to_repo)
|
2015-06-20 08:34:32 -04:00
|
|
|
@raw_repository.autocrlf = :input
|
|
|
|
end
|
|
|
|
|
2013-04-01 09:56:25 -04:00
|
|
|
rescue Gitlab::Git::Repository::NoRepository
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
|
2014-07-31 13:12:49 -04:00
|
|
|
# Return absolute path to repository
|
2013-10-01 10:00:28 -04:00
|
|
|
def path_to_repo
|
2014-07-31 13:12:49 -04:00
|
|
|
@path_to_repo ||= File.expand_path(
|
|
|
|
File.join(Gitlab.config.gitlab_shell.repos_path, path_with_namespace + ".git")
|
|
|
|
)
|
2013-10-01 10:00:28 -04:00
|
|
|
end
|
|
|
|
|
2013-04-01 09:56:25 -04:00
|
|
|
def exists?
|
|
|
|
raw_repository
|
|
|
|
end
|
|
|
|
|
|
|
|
def empty?
|
|
|
|
raw_repository.empty?
|
2013-03-31 16:45:38 -04:00
|
|
|
end
|
|
|
|
|
2014-09-25 05:46:30 -04:00
|
|
|
def commit(id = 'HEAD')
|
2013-05-30 19:16:49 -04:00
|
|
|
return nil unless raw_repository
|
2013-08-05 09:51:04 -04:00
|
|
|
commit = Gitlab::Git::Commit.find(raw_repository, id)
|
2015-04-21 09:09:15 -04:00
|
|
|
commit = Commit.new(commit, @project) if commit
|
2013-03-31 16:45:38 -04:00
|
|
|
commit
|
2015-01-28 23:08:28 -05:00
|
|
|
rescue Rugged::OdbError
|
2014-10-10 08:58:11 -04:00
|
|
|
nil
|
2013-03-31 16:45:38 -04:00
|
|
|
end
|
|
|
|
|
2014-09-26 11:04:41 -04:00
|
|
|
def commits(ref, path = nil, limit = nil, offset = nil, skip_merges = false)
|
2013-08-05 09:51:04 -04:00
|
|
|
commits = Gitlab::Git::Commit.where(
|
|
|
|
repo: raw_repository,
|
|
|
|
ref: ref,
|
|
|
|
path: path,
|
|
|
|
limit: limit,
|
|
|
|
offset: offset,
|
|
|
|
)
|
2015-04-21 09:09:15 -04:00
|
|
|
commits = Commit.decorate(commits, @project) if commits.present?
|
2013-03-31 16:45:38 -04:00
|
|
|
commits
|
|
|
|
end
|
|
|
|
|
2013-08-05 09:51:04 -04:00
|
|
|
def commits_between(from, to)
|
|
|
|
commits = Gitlab::Git::Commit.between(raw_repository, from, to)
|
2015-04-21 09:09:15 -04:00
|
|
|
commits = Commit.decorate(commits, @project) if commits.present?
|
2013-03-31 16:45:38 -04:00
|
|
|
commits
|
|
|
|
end
|
|
|
|
|
2013-07-17 08:11:03 -04:00
|
|
|
def find_branch(name)
|
|
|
|
branches.find { |branch| branch.name == name }
|
|
|
|
end
|
|
|
|
|
|
|
|
def find_tag(name)
|
|
|
|
tags.find { |tag| tag.name == name }
|
|
|
|
end
|
|
|
|
|
2013-07-16 17:09:23 -04:00
|
|
|
def add_branch(branch_name, ref)
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(:branch_names)
|
2015-03-21 16:44:11 -04:00
|
|
|
@branches = nil
|
2013-07-16 17:09:23 -04:00
|
|
|
|
|
|
|
gitlab_shell.add_branch(path_with_namespace, branch_name, ref)
|
|
|
|
end
|
|
|
|
|
2014-06-23 21:35:36 -04:00
|
|
|
def add_tag(tag_name, ref, message = nil)
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(:tag_names)
|
2015-03-21 16:44:11 -04:00
|
|
|
@tags = nil
|
2013-07-17 07:43:18 -04:00
|
|
|
|
2014-06-23 21:35:36 -04:00
|
|
|
gitlab_shell.add_tag(path_with_namespace, tag_name, ref, message)
|
2013-07-17 07:43:18 -04:00
|
|
|
end
|
|
|
|
|
2013-07-16 15:19:07 -04:00
|
|
|
def rm_branch(branch_name)
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(:branch_names)
|
2015-03-21 16:44:11 -04:00
|
|
|
@branches = nil
|
2013-07-16 17:09:23 -04:00
|
|
|
|
2013-07-16 15:19:07 -04:00
|
|
|
gitlab_shell.rm_branch(path_with_namespace, branch_name)
|
|
|
|
end
|
|
|
|
|
2013-07-16 16:12:52 -04:00
|
|
|
def rm_tag(tag_name)
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(:tag_names)
|
2015-03-21 16:44:11 -04:00
|
|
|
@tags = nil
|
2013-07-16 17:09:23 -04:00
|
|
|
|
2013-07-16 16:12:52 -04:00
|
|
|
gitlab_shell.rm_tag(path_with_namespace, tag_name)
|
|
|
|
end
|
|
|
|
|
2013-05-15 08:22:34 -04:00
|
|
|
def branch_names
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:branch_names) { raw_repository.branch_names }
|
2013-05-15 08:22:34 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def tag_names
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:tag_names) { raw_repository.tag_names }
|
2013-05-15 08:22:34 -04:00
|
|
|
end
|
|
|
|
|
2013-07-09 03:44:47 -04:00
|
|
|
def commit_count
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:commit_count) do
|
2013-08-12 15:23:01 -04:00
|
|
|
begin
|
2014-06-11 16:13:31 -04:00
|
|
|
raw_repository.commit_count(self.root_ref)
|
2013-08-12 15:23:01 -04:00
|
|
|
rescue
|
|
|
|
0
|
|
|
|
end
|
2013-07-09 03:44:47 -04:00
|
|
|
end
|
2013-03-31 16:45:38 -04:00
|
|
|
end
|
|
|
|
|
2013-04-28 16:04:56 -04:00
|
|
|
# Return repo size in megabytes
|
|
|
|
# Cached in redis
|
|
|
|
def size
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:size) { raw_repository.size }
|
2013-04-28 16:04:56 -04:00
|
|
|
end
|
|
|
|
|
2015-07-17 08:50:03 -04:00
|
|
|
def cache_keys
|
2015-07-20 01:53:14 -04:00
|
|
|
%i(size branch_names tag_names commit_count
|
2015-07-17 08:50:03 -04:00
|
|
|
readme version contribution_guide changelog license)
|
|
|
|
end
|
|
|
|
|
|
|
|
def build_cache
|
|
|
|
cache_keys.each do |key|
|
|
|
|
unless cache.exist?(key)
|
|
|
|
send(key)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2013-04-28 16:04:56 -04:00
|
|
|
def expire_cache
|
2015-07-17 08:50:03 -04:00
|
|
|
cache_keys.each do |key|
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(key)
|
|
|
|
end
|
2013-06-25 06:55:03 -04:00
|
|
|
end
|
|
|
|
|
2015-07-17 08:50:03 -04:00
|
|
|
def rebuild_cache
|
|
|
|
cache_keys.each do |key|
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.expire(key)
|
2015-07-17 08:50:03 -04:00
|
|
|
send(key)
|
2013-06-25 06:55:03 -04:00
|
|
|
end
|
2013-04-28 16:04:56 -04:00
|
|
|
end
|
|
|
|
|
2015-03-21 16:44:51 -04:00
|
|
|
def lookup_cache
|
|
|
|
@lookup_cache ||= {}
|
|
|
|
end
|
|
|
|
|
2015-08-13 21:23:48 -04:00
|
|
|
def expire_branch_names
|
|
|
|
cache.expire(:branch_names)
|
|
|
|
end
|
|
|
|
|
2013-07-09 03:44:47 -04:00
|
|
|
def method_missing(m, *args, &block)
|
2015-03-21 16:44:51 -04:00
|
|
|
if m == :lookup && !block_given?
|
|
|
|
lookup_cache[m] ||= {}
|
|
|
|
lookup_cache[m][args.join(":")] ||= raw_repository.send(m, *args, &block)
|
|
|
|
else
|
|
|
|
raw_repository.send(m, *args, &block)
|
|
|
|
end
|
2013-07-09 03:44:47 -04:00
|
|
|
end
|
|
|
|
|
2015-05-23 18:38:44 -04:00
|
|
|
def respond_to_missing?(method, include_private = false)
|
|
|
|
raw_repository.respond_to?(method, include_private) || super
|
2013-03-31 16:45:38 -04:00
|
|
|
end
|
2013-10-01 13:34:41 -04:00
|
|
|
|
|
|
|
def blob_at(sha, path)
|
2015-07-01 05:02:37 -04:00
|
|
|
unless Gitlab::Git.blank_ref?(sha)
|
|
|
|
Gitlab::Git::Blob.find(self, sha, path)
|
|
|
|
end
|
2013-10-01 13:34:41 -04:00
|
|
|
end
|
2013-11-29 06:52:10 -05:00
|
|
|
|
2014-06-25 05:07:06 -04:00
|
|
|
def blob_by_oid(oid)
|
|
|
|
Gitlab::Git::Blob.raw(self, oid)
|
|
|
|
end
|
|
|
|
|
2013-11-29 06:52:10 -05:00
|
|
|
def readme
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:readme) { tree(:head).readme }
|
2013-11-29 06:52:10 -05:00
|
|
|
end
|
2014-02-04 07:46:15 -05:00
|
|
|
|
2014-06-25 05:07:06 -04:00
|
|
|
def version
|
2015-01-28 23:08:28 -05:00
|
|
|
cache.fetch(:version) do
|
2014-06-25 05:07:06 -04:00
|
|
|
tree(:head).blobs.find do |file|
|
|
|
|
file.name.downcase == 'version'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-02-22 10:37:10 -05:00
|
|
|
def contribution_guide
|
2015-03-17 05:28:50 -04:00
|
|
|
cache.fetch(:contribution_guide) do
|
|
|
|
tree(:head).blobs.find do |file|
|
|
|
|
file.contributing?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2015-03-17 05:29:17 -04:00
|
|
|
|
|
|
|
def changelog
|
|
|
|
cache.fetch(:changelog) do
|
|
|
|
tree(:head).blobs.find do |file|
|
2015-04-10 12:30:02 -04:00
|
|
|
file.name =~ /\A(changelog|history)/i
|
2015-03-17 05:29:17 -04:00
|
|
|
end
|
|
|
|
end
|
2014-02-22 10:37:10 -05:00
|
|
|
end
|
|
|
|
|
2015-03-17 13:37:50 -04:00
|
|
|
def license
|
|
|
|
cache.fetch(:license) do
|
|
|
|
tree(:head).blobs.find do |file|
|
2015-04-10 12:30:02 -04:00
|
|
|
file.name =~ /\Alicense/i
|
2015-03-17 13:37:50 -04:00
|
|
|
end
|
|
|
|
end
|
2014-02-22 10:37:10 -05:00
|
|
|
end
|
|
|
|
|
2014-02-04 07:46:15 -05:00
|
|
|
def head_commit
|
2015-03-21 16:45:08 -04:00
|
|
|
@head_commit ||= commit(self.root_ref)
|
|
|
|
end
|
|
|
|
|
|
|
|
def head_tree
|
|
|
|
@head_tree ||= Tree.new(self, head_commit.sha, nil)
|
2014-02-04 07:46:15 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def tree(sha = :head, path = nil)
|
|
|
|
if sha == :head
|
2015-03-21 16:45:08 -04:00
|
|
|
if path.nil?
|
|
|
|
return head_tree
|
|
|
|
else
|
|
|
|
sha = head_commit.sha
|
|
|
|
end
|
2014-02-04 07:46:15 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
Tree.new(self, sha, path)
|
|
|
|
end
|
2014-02-05 04:39:55 -05:00
|
|
|
|
|
|
|
def blob_at_branch(branch_name, path)
|
2014-02-18 05:27:02 -05:00
|
|
|
last_commit = commit(branch_name)
|
2014-02-05 04:39:55 -05:00
|
|
|
|
2014-02-18 05:27:02 -05:00
|
|
|
if last_commit
|
|
|
|
blob_at(last_commit.sha, path)
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
2014-02-05 04:39:55 -05:00
|
|
|
end
|
2014-02-10 06:02:26 -05:00
|
|
|
|
|
|
|
# Returns url for submodule
|
|
|
|
#
|
|
|
|
# Ex.
|
|
|
|
# @repository.submodule_url_for('master', 'rack')
|
|
|
|
# # => git@localhost:rack.git
|
|
|
|
#
|
|
|
|
def submodule_url_for(ref, path)
|
2014-02-24 06:22:00 -05:00
|
|
|
if submodules(ref).any?
|
2014-02-10 06:02:26 -05:00
|
|
|
submodule = submodules(ref)[path]
|
|
|
|
|
|
|
|
if submodule
|
|
|
|
submodule['url']
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2014-02-10 14:46:46 -05:00
|
|
|
|
|
|
|
def last_commit_for_path(sha, path)
|
2015-02-25 18:17:20 -05:00
|
|
|
args = %W(git rev-list --max-count=1 #{sha} -- #{path})
|
2014-09-29 07:40:36 -04:00
|
|
|
sha = Gitlab::Popen.popen(args, path_to_repo).first.strip
|
|
|
|
commit(sha)
|
2014-02-10 14:46:46 -05:00
|
|
|
end
|
2014-04-09 09:09:11 -04:00
|
|
|
|
|
|
|
# Remove archives older than 2 hours
|
|
|
|
def clean_old_archives
|
2014-09-29 11:02:45 -04:00
|
|
|
repository_downloads_path = Gitlab.config.gitlab.repository_downloads_path
|
2015-03-24 08:15:59 -04:00
|
|
|
|
|
|
|
return unless File.directory?(repository_downloads_path)
|
|
|
|
|
2014-09-29 11:02:45 -04:00
|
|
|
Gitlab::Popen.popen(%W(find #{repository_downloads_path} -not -path #{repository_downloads_path} -mmin +120 -delete))
|
2014-04-09 09:09:11 -04:00
|
|
|
end
|
2014-05-23 07:25:55 -04:00
|
|
|
|
|
|
|
def branches_sorted_by(value)
|
|
|
|
case value
|
|
|
|
when 'recently_updated'
|
|
|
|
branches.sort do |a, b|
|
|
|
|
commit(b.target).committed_date <=> commit(a.target).committed_date
|
|
|
|
end
|
|
|
|
when 'last_updated'
|
|
|
|
branches.sort do |a, b|
|
|
|
|
commit(a.target).committed_date <=> commit(b.target).committed_date
|
|
|
|
end
|
|
|
|
else
|
|
|
|
branches
|
|
|
|
end
|
|
|
|
end
|
2014-07-02 07:43:23 -04:00
|
|
|
|
|
|
|
def contributors
|
2014-09-30 04:56:48 -04:00
|
|
|
commits = self.commits(nil, nil, 2000, 0, true)
|
2014-07-02 07:43:23 -04:00
|
|
|
|
2014-09-30 04:56:48 -04:00
|
|
|
commits.group_by(&:author_email).map do |email, commits|
|
2014-07-02 08:09:06 -04:00
|
|
|
contributor = Gitlab::Contributor.new
|
|
|
|
contributor.email = email
|
2014-07-02 07:43:23 -04:00
|
|
|
|
2014-09-30 04:56:48 -04:00
|
|
|
commits.each do |commit|
|
2014-07-02 08:09:06 -04:00
|
|
|
if contributor.name.blank?
|
2014-09-30 04:56:48 -04:00
|
|
|
contributor.name = commit.author_name
|
2014-07-02 07:43:23 -04:00
|
|
|
end
|
|
|
|
|
2014-07-02 08:09:06 -04:00
|
|
|
contributor.commits += 1
|
2014-07-02 07:43:23 -04:00
|
|
|
end
|
|
|
|
|
2014-07-02 08:09:06 -04:00
|
|
|
contributor
|
|
|
|
end
|
2014-07-02 07:43:23 -04:00
|
|
|
end
|
2014-07-28 13:54:40 -04:00
|
|
|
|
|
|
|
def blob_for_diff(commit, diff)
|
|
|
|
file = blob_at(commit.id, diff.new_path)
|
|
|
|
|
|
|
|
unless file
|
|
|
|
file = prev_blob_for_diff(commit, diff)
|
|
|
|
end
|
|
|
|
|
|
|
|
file
|
|
|
|
end
|
|
|
|
|
|
|
|
def prev_blob_for_diff(commit, diff)
|
|
|
|
if commit.parent_id
|
|
|
|
blob_at(commit.parent_id, diff.old_path)
|
|
|
|
end
|
|
|
|
end
|
2014-09-29 09:40:13 -04:00
|
|
|
|
|
|
|
def branch_names_contains(sha)
|
|
|
|
args = %W(git branch --contains #{sha})
|
|
|
|
names = Gitlab::Popen.popen(args, path_to_repo).first
|
|
|
|
|
|
|
|
if names.respond_to?(:split)
|
|
|
|
names = names.split("\n").map(&:strip)
|
|
|
|
|
|
|
|
names.each do |name|
|
|
|
|
name.slice! '* '
|
|
|
|
end
|
|
|
|
|
|
|
|
names
|
|
|
|
else
|
|
|
|
[]
|
|
|
|
end
|
|
|
|
end
|
2015-01-17 08:12:49 -05:00
|
|
|
|
|
|
|
def tag_names_contains(sha)
|
|
|
|
args = %W(git tag --contains #{sha})
|
|
|
|
names = Gitlab::Popen.popen(args, path_to_repo).first
|
|
|
|
|
|
|
|
if names.respond_to?(:split)
|
|
|
|
names = names.split("\n").map(&:strip)
|
|
|
|
|
|
|
|
names.each do |name|
|
|
|
|
name.slice! '* '
|
|
|
|
end
|
|
|
|
|
|
|
|
names
|
|
|
|
else
|
|
|
|
[]
|
|
|
|
end
|
|
|
|
end
|
2015-01-28 23:08:28 -05:00
|
|
|
|
2015-03-21 16:44:11 -04:00
|
|
|
def branches
|
|
|
|
@branches ||= raw_repository.branches
|
|
|
|
end
|
|
|
|
|
|
|
|
def tags
|
|
|
|
@tags ||= raw_repository.tags
|
|
|
|
end
|
|
|
|
|
|
|
|
def root_ref
|
|
|
|
@root_ref ||= raw_repository.root_ref
|
|
|
|
end
|
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
def commit_file(user, path, content, message, branch)
|
|
|
|
commit_with_hooks(user, branch) do |ref|
|
|
|
|
path[0] = '' if path[0] == '/'
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
committer = user_to_comitter(user)
|
|
|
|
options = {}
|
|
|
|
options[:committer] = committer
|
|
|
|
options[:author] = committer
|
|
|
|
options[:commit] = {
|
|
|
|
message: message,
|
|
|
|
branch: ref,
|
|
|
|
}
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
options[:file] = {
|
|
|
|
content: content,
|
|
|
|
path: path
|
|
|
|
}
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
Gitlab::Git::Blob.commit(raw_repository, options)
|
|
|
|
end
|
2015-08-11 08:33:31 -04:00
|
|
|
end
|
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
def remove_file(user, path, message, branch)
|
2015-08-14 11:52:49 -04:00
|
|
|
commit_with_hooks(user, branch) do |ref|
|
2015-08-14 10:23:40 -04:00
|
|
|
path[0] = '' if path[0] == '/'
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
committer = user_to_comitter(user)
|
|
|
|
options = {}
|
|
|
|
options[:committer] = committer
|
|
|
|
options[:author] = committer
|
|
|
|
options[:commit] = {
|
|
|
|
message: message,
|
|
|
|
branch: ref
|
|
|
|
}
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
options[:file] = {
|
|
|
|
path: path
|
|
|
|
}
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
Gitlab::Git::Blob.remove(raw_repository, options)
|
|
|
|
end
|
2015-08-11 08:33:31 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def user_to_comitter(user)
|
|
|
|
{
|
|
|
|
email: user.email,
|
|
|
|
name: user.name,
|
|
|
|
time: Time.now
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
def can_be_merged?(source_sha, target_branch)
|
|
|
|
our_commit = rugged.branches[target_branch].target
|
|
|
|
their_commit = rugged.lookup(source_sha)
|
|
|
|
|
|
|
|
if our_commit && their_commit
|
|
|
|
!rugged.merge_commits(our_commit, their_commit).conflicts?
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-08-14 11:52:49 -04:00
|
|
|
def merge(user, source_sha, target_branch, options = {})
|
2015-08-11 08:33:31 -04:00
|
|
|
our_commit = rugged.branches[target_branch].target
|
|
|
|
their_commit = rugged.lookup(source_sha)
|
|
|
|
|
|
|
|
raise "Invalid merge target" if our_commit.nil?
|
|
|
|
raise "Invalid merge source" if their_commit.nil?
|
|
|
|
|
|
|
|
merge_index = rugged.merge_commits(our_commit, their_commit)
|
|
|
|
return false if merge_index.conflicts?
|
|
|
|
|
2015-08-14 11:52:49 -04:00
|
|
|
commit_with_hooks(user, target_branch) do |ref|
|
|
|
|
actual_options = options.merge(
|
|
|
|
parents: [our_commit, their_commit],
|
|
|
|
tree: merge_index.write_tree(rugged),
|
|
|
|
update_ref: ref
|
|
|
|
)
|
2015-08-11 08:33:31 -04:00
|
|
|
|
2015-08-14 11:52:49 -04:00
|
|
|
Rugged::Commit.create(rugged, actual_options)
|
|
|
|
end
|
2015-08-11 08:33:31 -04:00
|
|
|
end
|
|
|
|
|
2015-08-09 14:31:50 -04:00
|
|
|
def merged_to_root_ref?(branch_name)
|
|
|
|
branch_commit = commit(branch_name)
|
|
|
|
root_ref_commit = commit(root_ref)
|
|
|
|
|
|
|
|
if branch_commit
|
|
|
|
rugged.merge_base(root_ref_commit.id, branch_commit.id) == branch_commit.id
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-07-10 11:50:50 -04:00
|
|
|
def search_files(query, ref)
|
|
|
|
offset = 2
|
|
|
|
args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref})
|
|
|
|
Gitlab::Popen.popen(args, path_to_repo).first.scrub.split(/^--$/)
|
|
|
|
end
|
|
|
|
|
2015-07-12 08:01:06 -04:00
|
|
|
def parse_search_result(result)
|
2015-07-10 11:50:50 -04:00
|
|
|
ref = nil
|
|
|
|
filename = nil
|
|
|
|
startline = 0
|
|
|
|
|
2015-07-13 05:27:25 -04:00
|
|
|
result.each_line.each_with_index do |line, index|
|
2015-07-10 11:50:50 -04:00
|
|
|
if line =~ /^.*:.*:\d+:/
|
|
|
|
ref, filename, startline = line.split(':')
|
|
|
|
startline = startline.to_i - index
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-07-13 05:27:25 -04:00
|
|
|
data = ""
|
2015-07-10 11:50:50 -04:00
|
|
|
|
2015-07-13 05:27:25 -04:00
|
|
|
result.each_line do |line|
|
|
|
|
data << line.sub(ref, '').sub(filename, '').sub(/^:-\d+-/, '').sub(/^::\d+:/, '')
|
|
|
|
end
|
2015-07-10 11:50:50 -04:00
|
|
|
|
|
|
|
OpenStruct.new(
|
|
|
|
filename: filename,
|
|
|
|
ref: ref,
|
|
|
|
startline: startline,
|
|
|
|
data: data
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2015-08-11 08:33:31 -04:00
|
|
|
def fetch_ref(source_path, source_ref, target_ref)
|
|
|
|
args = %W(git fetch #{source_path} #{source_ref}:#{target_ref})
|
|
|
|
Gitlab::Popen.popen(args, path_to_repo)
|
|
|
|
end
|
|
|
|
|
2015-08-14 10:23:40 -04:00
|
|
|
def commit_with_hooks(current_user, branch)
|
|
|
|
oldrev = Gitlab::Git::BLANK_SHA
|
|
|
|
ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
|
|
|
|
gl_id = Gitlab::ShellEnv.gl_id(current_user)
|
2015-08-17 04:24:25 -04:00
|
|
|
was_empty = empty?
|
2015-08-14 10:23:40 -04:00
|
|
|
|
|
|
|
# Create temporary ref
|
|
|
|
random_string = SecureRandom.hex
|
|
|
|
tmp_ref = "refs/tmp/#{random_string}/head"
|
|
|
|
|
2015-08-17 04:24:25 -04:00
|
|
|
unless was_empty
|
2015-08-14 10:23:40 -04:00
|
|
|
oldrev = find_branch(branch).target
|
|
|
|
rugged.references.create(tmp_ref, oldrev)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Make commit in tmp ref
|
|
|
|
newrev = yield(tmp_ref)
|
|
|
|
|
|
|
|
unless newrev
|
|
|
|
raise CommitError.new('Failed to create commit')
|
|
|
|
end
|
|
|
|
|
|
|
|
# Run GitLab pre-receive hook
|
|
|
|
pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', path_to_repo)
|
|
|
|
status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
|
|
|
|
|
|
|
|
if status
|
2015-08-17 04:24:25 -04:00
|
|
|
if was_empty
|
2015-08-14 10:23:40 -04:00
|
|
|
# Create branch
|
|
|
|
rugged.references.create(ref, newrev)
|
|
|
|
else
|
|
|
|
# Update head
|
|
|
|
current_head = find_branch(branch).target
|
|
|
|
|
|
|
|
# Make sure target branch was not changed during pre-receive hook
|
|
|
|
if current_head == oldrev
|
|
|
|
rugged.references.update(ref, newrev)
|
|
|
|
else
|
|
|
|
raise CommitError.new('Commit was rejected because branch received new push')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Run GitLab post receive hook
|
|
|
|
post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
|
|
|
|
status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
|
|
|
|
else
|
|
|
|
# Remove tmp ref and return error to user
|
|
|
|
rugged.references.delete(tmp_ref)
|
|
|
|
|
2015-08-17 04:47:29 -04:00
|
|
|
raise PreReceiveError.new('Commit was rejected by pre-receive hook')
|
2015-08-14 10:23:40 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-07-01 10:23:58 -04:00
|
|
|
private
|
|
|
|
|
2015-01-28 23:08:28 -05:00
|
|
|
def cache
|
|
|
|
@cache ||= RepositoryCache.new(path_with_namespace)
|
|
|
|
end
|
2013-03-31 16:45:38 -04:00
|
|
|
end
|