Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d99d5198
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,发现更多精彩内容 >>
未验证
提交
d99d5198
编写于
8月 08, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add MergeRequest#branch_merge_base_commit method
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
08f5f897
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
8 deletion
+44
-8
app/models/merge_request.rb
app/models/merge_request.rb
+27
-8
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+17
-0
未找到文件。
app/models/merge_request.rb
浏览文件 @
d99d5198
...
...
@@ -177,8 +177,8 @@ class MergeRequest < ActiveRecord::Base
def
diff_base_commit
if
persisted?
merge_request_diff
.
base_commit
els
if
diff_start_commit
&&
diff_head_commit
self
.
target_project
.
merge_base_commit
(
diff_start_sha
,
diff_head_sha
)
els
e
branch_merge_base_commit
end
end
...
...
@@ -239,6 +239,15 @@ class MergeRequest < ActiveRecord::Base
target_project
.
repository
.
commit
(
target_branch
)
if
target_branch_ref
end
def
branch_merge_base_commit
start_sha
=
target_branch_sha
head_sha
=
source_branch_sha
if
start_sha
&&
head_sha
target_project
.
merge_base_commit
(
start_sha
,
head_sha
)
end
end
def
target_branch_sha
@target_branch_sha
||
target_branch_head
.
try
(
:sha
)
end
...
...
@@ -247,15 +256,25 @@ class MergeRequest < ActiveRecord::Base
@source_branch_sha
||
source_branch_head
.
try
(
:sha
)
end
def
branch_merge_base_sha
branch_merge_base_commit
.
try
(
:sha
)
end
def
diff_refs
if
merge_request_diff
merge_request_diff
.
diff_refs
elsif
diff_start_commit
||
diff_base_commit
Gitlab
::
Diff
::
DiffRefs
.
new
(
base_sha:
diff_base_sha
,
start_sha:
diff_start_sha
,
head_sha:
diff_head_sha
)
else
start_sha
=
target_branch_sha
head_sha
=
source_branch_sha
base_sha
=
branch_merge_base_sha
if
start_sha
||
base_sha
Gitlab
::
Diff
::
DiffRefs
.
new
(
base_sha:
base_sha
,
start_sha:
start_sha
,
head_sha:
head_sha
)
end
end
end
...
...
spec/models/merge_request_spec.rb
浏览文件 @
d99d5198
...
...
@@ -691,4 +691,21 @@ describe MergeRequest, models: true do
subject
.
reload_diff
end
end
describe
'#branch_merge_base_commit'
do
context
'source and target branch exist'
do
it
{
expect
(
subject
.
branch_merge_base_commit
.
sha
).
to
eq
(
'ae73cb07c9eeaf35924a10f713b364d32b2dd34f'
)
}
it
{
expect
(
subject
.
branch_merge_base_commit
).
to
be_a
(
Commit
)
}
end
context
'when the target branch does not exist'
do
before
do
subject
.
project
.
repository
.
raw_repository
.
delete_branch
(
subject
.
target_branch
)
end
it
'returns nil'
do
expect
(
subject
.
branch_merge_base_commit
).
to
be_nil
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录