Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c9aa7932
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 搜索 >>
提交
c9aa7932
编写于
9月 04, 2017
作者:
M
micael.bergeron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert to using a simple representation
上级
bca72f59
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
22 deletion
+25
-22
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/gitlab/encoding_helper.rb
lib/gitlab/encoding_helper.rb
+12
-5
lib/gitlab/git/blob.rb
lib/gitlab/git/blob.rb
+4
-8
lib/gitlab/git/diff.rb
lib/gitlab/git/diff.rb
+8
-8
未找到文件。
lib/api/entities.rb
浏览文件 @
c9aa7932
...
...
@@ -295,7 +295,7 @@ module API
expose
:new_file?
,
as: :new_file
expose
:renamed_file?
,
as: :renamed_file
expose
:deleted_file?
,
as: :deleted_file
expose
:diff
expose
:
json_safe_diff
,
as: :
diff
end
class
ProtectedRefAccess
<
Grape
::
Entity
...
...
lib/gitlab/encoding_helper.rb
浏览文件 @
c9aa7932
...
...
@@ -24,7 +24,7 @@ module Gitlab
# return message if message type is binary
detect
=
CharlockHolmes
::
EncodingDetector
.
detect
(
message
)
return
message
.
force_encoding
(
"BINARY"
)
if
binary?
(
message
,
detect
)
return
message
.
force_encoding
(
"BINARY"
)
if
all_
binary?
(
message
,
detect
)
if
detect
&&
detect
[
:encoding
]
&&
detect
[
:confidence
]
>
ENCODING_CONFIDENCE_THRESHOLD
# force detected encoding if we have sufficient confidence.
...
...
@@ -34,14 +34,21 @@ module Gitlab
# encode and clean the bad chars
message
.
replace
clean
(
message
)
rescue
=>
e
byebug
encoding
=
detect
?
detect
[
:encoding
]
:
"unknown"
"--broken encoding:
#{
encoding
}
"
end
def
binary?
(
message
,
detect
=
nil
)
detect
||=
CharlockHolmes
::
EncodingDetector
.
detect
(
message
)
detect
&&
detect
[
:type
]
==
:binary
&&
detect
[
:confidence
]
==
100
def
all_binary?
(
data
,
detect
=
nil
)
detect
||=
CharlockHolmes
::
EncodingDetector
.
detect
(
data
)
detect
&&
detect
[
:type
]
==
:binary
end
def
libgit2_binary?
(
data
)
# EncodingDetector checks the first 1024 * 1024 bytes for NUL byte, libgit2 checks
# only the first 8000 (https://github.com/libgit2/libgit2/blob/2ed855a9e8f9af211e7274021c2264e600c0f86b/src/filter.h#L15),
# which is what we use below to keep a consistent behavior.
detect
=
CharlockHolmes
::
EncodingDetector
.
new
(
8000
).
detect
(
data
)
all_binary?
(
data
,
detect
)
end
def
encode_utf8
(
message
)
...
...
lib/gitlab/git/blob.rb
浏览文件 @
c9aa7932
...
...
@@ -42,14 +42,6 @@ module Gitlab
end
end
def
binary?
(
data
)
# EncodingDetector checks the first 1024 * 1024 bytes for NUL byte, libgit2 checks
# only the first 8000 (https://github.com/libgit2/libgit2/blob/2ed855a9e8f9af211e7274021c2264e600c0f86b/src/filter.h#L15),
# which is what we use below to keep a consistent behavior.
detect
=
CharlockHolmes
::
EncodingDetector
.
new
(
8000
).
detect
(
data
)
detect
&&
detect
[
:type
]
==
:binary
end
# Returns an array of Blob instances, specified in blob_references as
# [[commit_sha, path], [commit_sha, path], ...]. If blob_size_limit < 0 then the
# full blob contents are returned. If blob_size_limit >= 0 then each blob will
...
...
@@ -169,6 +161,10 @@ module Gitlab
end
end
end
def
binary?
(
data
)
EncodingHelper
.
libgit2_binary?
(
data
)
end
end
def
initialize
(
options
)
...
...
lib/gitlab/git/diff.rb
浏览文件 @
c9aa7932
...
...
@@ -197,6 +197,13 @@ module Gitlab
@collapsed
=
true
end
def
json_safe_diff
return
@diff
unless
all_binary?
(
@diff
)
# the diff is binary, let's make a message for it
Diff
::
binary_message
(
@old_path
,
@new_path
)
end
private
def
init_from_rugged
(
rugged
)
...
...
@@ -221,14 +228,7 @@ module Gitlab
# binary we're not going to display anything so we skip the size check.
return
if
!
patch
.
delta
.
binary?
&&
prune_large_patch
(
patch
)
diff
=
strip_diff_headers
(
patch
.
to_s
)
@diff
=
if
binary?
(
diff
)
# the diff is binary, let's make a message for it
Diff
::
binary_message
(
patch
.
delta
.
old_file
[
:path
],
patch
.
delta
.
new_file
[
:path
])
else
encode!
(
diff
)
end
@diff
=
encode!
(
strip_diff_headers
(
patch
.
to_s
))
end
def
init_from_hash
(
hash
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录