Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
122769e3
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
122769e3
编写于
10月 20, 2012
作者:
R
Riyad Preukschas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor Gitlab::Merge
* Refactor and document methods * Rename merge to merge! * Fixes #1544
上级
51ef5b92
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
72 addition
and
33 deletion
+72
-33
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
lib/gitlab/merge.rb
lib/gitlab/merge.rb
+71
-32
未找到文件。
app/models/merge_request.rb
浏览文件 @
122769e3
...
...
@@ -166,7 +166,7 @@ class MergeRequest < ActiveRecord::Base
end
def
automerge!
(
current_user
)
if
Gitlab
::
Merge
.
new
(
self
,
current_user
).
merge
&&
self
.
unmerged_commits
.
empty?
if
Gitlab
::
Merge
.
new
(
self
,
current_user
).
merge
!
&&
self
.
unmerged_commits
.
empty?
self
.
merge!
(
current_user
.
id
)
true
end
...
...
lib/gitlab/merge.rb
浏览文件 @
122769e3
module
Gitlab
class
Merge
attr_accessor
:
project
,
:merge_reques
t
,
:user
attr_accessor
:
merge_request
,
:projec
t
,
:user
def
initialize
(
merge_request
,
user
)
self
.
user
=
user
self
.
merge_request
=
merge_reques
t
self
.
project
=
merge_request
.
project
@merge_request
=
merge_request
@project
=
merge_request
.
projec
t
@user
=
user
end
def
can_be_merged?
result
=
false
process
do
|
repo
,
output
|
result
=
!
(
output
=~
/CONFLICT/
)
in_locked_and_timed_satellite
do
|
merge_repo
|
merge_in_satellite!
(
merge_repo
)
end
result
end
def
merge
process
do
|
repo
,
output
|
if
output
=~
/CONFLICT/
false
else
!!
repo
.
git
.
push
({},
"origin"
,
merge_request
.
target_branch
)
# Merges the source branch into the target branch in the satellite and
# pushes it back to Gitolite.
# It also removes the source branch if requested in the merge request.
#
# Returns false if the merge produced conflicts
# Returns false if pushing from the satallite to Gitolite failed or was rejected
# Returns true otherwise
def
merge!
in_locked_and_timed_satellite
do
|
merge_repo
|
if
merge_in_satellite!
(
merge_repo
)
# push merge back to Gitolite
# will raise CommandFailed when push fails
merge_repo
.
git
.
push
({
raise:
true
},
:origin
,
merge_request
.
target_branch
)
# remove source branch
if
merge_request
.
should_remove_source_branch
&&
!
project
.
root_ref?
(
merge_request
.
source_branch
)
# will raise CommandFailed when push fails
merge_repo
.
git
.
push
({
raise:
true
},
:origin
,
":
#{
merge_request
.
source_branch
}
"
)
end
# merge, push and branch removal successful
true
end
end
rescue
Grit
::
Git
::
CommandFailed
false
end
def
process
private
# * Sets a 30s timeout for Git
# * Locks the satellite repo
# * Yields the prepared satallite repo
def
in_locked_and_timed_satellite
Grit
::
Git
.
with_timeout
(
30
.
seconds
)
do
lock_file
=
Rails
.
root
.
join
(
"tmp"
,
"
#{
project
.
path
}
.lock"
)
...
...
@@ -37,29 +58,47 @@ module Gitlab
raise
"Satellite doesn't exist"
end
project
.
satellite
.
clear
Dir
.
chdir
(
project
.
satellite
.
path
)
do
merge_repo
=
Grit
::
Repo
.
new
(
'.'
)
merge_repo
.
git
.
sh
"git reset --hard"
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
)
#remove source-branch
if
merge_request
.
should_remove_source_branch
&&
!
project
.
root_ref?
(
merge_request
.
source_branch
)
merge_repo
.
git
.
sh
"git push origin :
#{
merge_request
.
source_branch
}
"
end
yield
(
merge_repo
,
output
)
repo
=
Grit
::
Repo
.
new
(
'.'
)
return
yield
repo
end
end
end
rescue
Grit
::
Git
::
GitTimeout
return
false
end
# Merges the source_branch into the target_branch in the satellite.
#
# Note: it will clear out the satellite before doing anything
#
# Returns false if the merge produced conflicts
# Returns true otherwise
def
merge_in_satellite!
(
repo
)
prepare_satelite!
(
repo
)
# create target branch in satellite at the corresponding commit from Gitolite
repo
.
git
.
checkout
({
b:
true
},
merge_request
.
target_branch
,
"origin/
#{
merge_request
.
target_branch
}
"
)
# merge the source branch from Gitolite into the satellite
# will raise CommandFailed when merge fails
repo
.
git
.
pull
({
no_ff:
true
,
raise:
true
},
:origin
,
merge_request
.
source_branch
)
rescue
Grit
::
Git
::
CommandFailed
false
end
# * Clears the satellite
# * Updates the satellite from Gitolite
# * Sets up Git variables for the user
def
prepare_satelite!
(
repo
)
project
.
satellite
.
clear
repo
.
git
.
reset
(
hard:
true
)
repo
.
git
.
fetch
({},
:origin
)
repo
.
git
.
config
({},
"user.name"
,
user
.
name
)
repo
.
git
.
config
({},
"user.email"
,
user
.
email
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录