Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2db75f8d
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,发现更多精彩内容 >>
提交
2db75f8d
编写于
7月 06, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make methods private that don't need to be public
上级
228d2a4c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
47 addition
and
43 deletion
+47
-43
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+47
-43
未找到文件。
app/models/merge_request_diff.rb
浏览文件 @
2db75f8d
...
...
@@ -65,42 +65,36 @@ class MergeRequestDiff < ActiveRecord::Base
def
base_commit
return
unless
self
.
base_commit_sha
merge_request
.
target_
project
.
commit
(
self
.
base_commit_sha
)
project
.
commit
(
self
.
base_commit_sha
)
end
def
start_commit
return
unless
self
.
start_commit_sha
merge_request
.
target_
project
.
commit
(
self
.
start_commit_sha
)
project
.
commit
(
self
.
start_commit_sha
)
end
def
head_commit
return
last_commit
unless
self
.
head_commit_sha
merge_request
.
target_
project
.
commit
(
self
.
head_commit_sha
)
project
.
commit
(
self
.
head_commit_sha
)
end
def
dump_commits
(
commits
)
commits
.
map
(
&
:to_hash
)
end
def
load_commits
(
array
)
array
.
map
{
|
hash
|
Commit
.
new
(
Gitlab
::
Git
::
Commit
.
new
(
hash
),
merge_request
.
source_project
)
}
end
def
compare
@compare
||=
begin
# Update ref for merge request
merge_request
.
fetch_ref
def
dump_diffs
(
diffs
)
if
diffs
.
respond_to?
(
:map
)
diffs
.
map
(
&
:to_hash
)
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
self
.
target_branch_sha
,
self
.
source_branch_sha
)
end
end
def
load_diffs
(
raw
,
options
)
if
raw
.
respond_to?
(
:each
)
Gitlab
::
Git
::
DiffCollection
.
new
(
raw
,
options
)
else
Gitlab
::
Git
::
DiffCollection
.
new
([])
end
end
private
# Collect array of Git::Commit objects
# between target and source branches
...
...
@@ -114,6 +108,14 @@ class MergeRequestDiff < ActiveRecord::Base
commits
end
def
dump_commits
(
commits
)
commits
.
map
(
&
:to_hash
)
end
def
load_commits
(
array
)
array
.
map
{
|
hash
|
Commit
.
new
(
Gitlab
::
Git
::
Commit
.
new
(
hash
),
merge_request
.
source_project
)
}
end
# Reload all commits related to current merge request from repo
# and save it as array of hashes in st_commits db field
def
reload_commits
...
...
@@ -128,6 +130,26 @@ class MergeRequestDiff < ActiveRecord::Base
update_columns_serialized
(
new_attributes
)
end
# Collect array of Git::Diff objects
# between target and source branches
def
unmerged_diffs
compare
.
diffs
(
Commit
.
max_diff_options
)
end
def
dump_diffs
(
diffs
)
if
diffs
.
respond_to?
(
:map
)
diffs
.
map
(
&
:to_hash
)
end
end
def
load_diffs
(
raw
,
options
)
if
raw
.
respond_to?
(
:each
)
Gitlab
::
Git
::
DiffCollection
.
new
(
raw
,
options
)
else
Gitlab
::
Git
::
DiffCollection
.
new
([])
end
end
# Reload diffs between branches related to current merge request from repo
# and save it as array of hashes in st_diffs db field
def
reload_diffs
...
...
@@ -164,42 +186,24 @@ class MergeRequestDiff < ActiveRecord::Base
keep_around_commits
end
# Collect array of Git::Diff objects
# between target and source branches
def
unmerged_diffs
compare
.
diffs
(
Commit
.
max_diff_options
)
def
project
merge_request
.
target_project
end
def
repository
merge_request
.
target_
project
.
repository
project
.
repository
end
def
branch_base_commit
return
unless
self
.
source_branch_sha
&&
self
.
target_branch_sha
merge_request
.
target_
project
.
merge_base_commit
(
self
.
source_branch_sha
,
self
.
target_branch_sha
)
project
.
merge_base_commit
(
self
.
source_branch_sha
,
self
.
target_branch_sha
)
end
def
branch_base_sha
branch_base_commit
.
try
(
:sha
)
end
def
compare
@compare
||=
begin
# Update ref for merge request
merge_request
.
fetch_ref
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
self
.
target_branch_sha
,
self
.
source_branch_sha
)
end
end
private
#
# #save or #update_attributes providing changes on serialized attributes do a lot of
# serialization and deserialization calls resulting in bad performance.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录