Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5cce1278
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,体验更适合开发者的 AI 搜索 >>
提交
5cce1278
编写于
1月 27, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correctly determine MR diff base when MR has merge conflicts
上级
a93f7099
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
22 deletion
+19
-22
CHANGELOG
CHANGELOG
+1
-2
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+2
-2
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+11
-17
app/models/project.rb
app/models/project.rb
+4
-0
未找到文件。
CHANGELOG
浏览文件 @
5cce1278
...
...
@@ -20,8 +20,7 @@ v 8.4.2 (unreleased)
improvement when checking if a repository was empty
- Add instrumentation for Gitlab::Git::Repository instance methods so we can
track them in Performance Monitoring.
v 8.4.2 (unreleased)
- Correctly highlight MR diff when MR has merge conflicts
- Fix method undefined when using external commit status in builds
v 8.4.1
...
...
app/controllers/projects/compare_controller.rb
浏览文件 @
5cce1278
...
...
@@ -21,7 +21,7 @@ class Projects::CompareController < Projects::ApplicationController
@commits
=
Commit
.
decorate
(
compare_result
.
commits
,
@project
)
@diffs
=
compare_result
.
diffs
@commit
=
@project
.
commit
(
head_ref
)
@base_commit
=
@project
.
commit
(
base
_ref
)
@base_commit
=
@project
.
merge_base_commit
(
base_ref
,
head
_ref
)
@diff_refs
=
[
@base_commit
,
@commit
]
@line_notes
=
[]
end
...
...
app/models/merge_request.rb
浏览文件 @
5cce1278
...
...
@@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base
if
merge_request_diff
merge_request_diff
.
base_commit
else
self
.
target_project
.
commit
(
self
.
target_branch
)
self
.
target_project
.
merge_base_commit
(
self
.
source_sha
,
self
.
target_branch
)
end
end
...
...
@@ -489,7 +489,7 @@ class MergeRequest < ActiveRecord::Base
end
def
source_sha
commits
.
firs
t
.
sha
last_commi
t
.
sha
end
def
fetch_ref
...
...
app/models/merge_request_diff.rb
浏览文件 @
5cce1278
...
...
@@ -48,14 +48,11 @@ class MergeRequestDiff < ActiveRecord::Base
end
def
diffs_no_whitespace
# Get latest sha of branch from source project
source_sha
=
merge_request
.
source_project
.
commit
(
source_branch
).
sha
compare_result
=
Gitlab
::
CompareResult
.
new
(
Gitlab
::
Git
::
Compare
.
new
(
merge_request
.
target_project
.
repository
.
raw_repository
,
merge_request
.
target_branch
,
source_sha
,
self
.
repository
.
raw_repository
,
self
.
target_branch
,
s
elf
.
s
ource_sha
,
),
{
ignore_whitespace_change:
true
}
)
@diffs_no_whitespace
||=
load_diffs
(
dump_commits
(
compare_result
.
diffs
))
...
...
@@ -83,8 +80,6 @@ class MergeRequestDiff < ActiveRecord::Base
@last_commit_short_sha
||=
last_commit
.
short_id
end
private
def
dump_commits
(
commits
)
commits
.
map
(
&
:to_hash
)
end
...
...
@@ -163,7 +158,7 @@ class MergeRequestDiff < ActiveRecord::Base
self
.
st_diffs
=
new_diffs
self
.
base_commit_sha
=
merge_request
.
target_project
.
commit
(
target_branch
).
try
(
:sha
)
self
.
base_commit_sha
=
self
.
repository
.
merge_base
(
self
.
source_sha
,
self
.
target_branch
)
self
.
save
end
...
...
@@ -181,7 +176,10 @@ class MergeRequestDiff < ActiveRecord::Base
merge_request
.
target_project
.
repository
end
private
def
source_sha
source_commit
=
merge_request
.
source_project
.
commit
(
source_branch
)
source_commit
.
try
(
:sha
)
end
def
compare_result
@compare_result
||=
...
...
@@ -189,15 +187,11 @@ class MergeRequestDiff < ActiveRecord::Base
# Update ref for merge request
merge_request
.
fetch_ref
# Get latest sha of branch from source project
source_commit
=
merge_request
.
source_project
.
commit
(
source_branch
)
source_sha
=
source_commit
.
try
(
:sha
)
Gitlab
::
CompareResult
.
new
(
Gitlab
::
Git
::
Compare
.
new
(
merge_request
.
target_project
.
repository
.
raw_repository
,
merge_request
.
target_branch
,
s
ource_sha
,
self
.
repository
.
raw_repository
,
self
.
target_branch
,
s
elf
.
source_sha
)
)
end
...
...
app/models/project.rb
浏览文件 @
5cce1278
...
...
@@ -348,6 +348,10 @@ class Project < ActiveRecord::Base
repository
.
commit
(
id
)
end
def
merge_base_commit
(
first_commit_id
,
second_commit_id
)
repository
.
commit
(
repository
.
merge_base
(
first_commit_id
,
second_commit_id
))
end
def
saved?
id
&&
persisted?
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录