Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a6af5522
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 搜索 >>
提交
a6af5522
编写于
9月 05, 2017
作者:
M
micael.bergeron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
renames ambiguous methods and add spec
上级
dbaed90c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
7 deletion
+15
-7
lib/gitlab/encoding_helper.rb
lib/gitlab/encoding_helper.rb
+5
-5
lib/gitlab/git/blob.rb
lib/gitlab/git/blob.rb
+1
-1
lib/gitlab/git/diff.rb
lib/gitlab/git/diff.rb
+3
-1
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+6
-0
未找到文件。
lib/gitlab/encoding_helper.rb
浏览文件 @
a6af5522
...
...
@@ -24,7 +24,7 @@ module Gitlab
# return message if message type is binary
detect
=
CharlockHolmes
::
EncodingDetector
.
detect
(
message
)
return
message
.
force_encoding
(
"BINARY"
)
if
all
_binary?
(
message
,
detect
)
return
message
.
force_encoding
(
"BINARY"
)
if
detect
_binary?
(
message
,
detect
)
if
detect
&&
detect
[
:encoding
]
&&
detect
[
:confidence
]
>
ENCODING_CONFIDENCE_THRESHOLD
# force detected encoding if we have sufficient confidence.
...
...
@@ -38,17 +38,17 @@ module Gitlab
"--broken encoding:
#{
encoding
}
"
end
def
all
_binary?
(
data
,
detect
=
nil
)
def
detect
_binary?
(
data
,
detect
=
nil
)
detect
||=
CharlockHolmes
::
EncodingDetector
.
detect
(
data
)
detect
&&
detect
[
:type
]
==
:binary
detect
&&
detect
[
:type
]
==
:binary
&&
detect
[
:confidence
]
==
100
end
def
libgit2_binary?
(
data
)
def
detect_
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
)
detect
&&
detect
[
:type
]
==
:binary
end
def
encode_utf8
(
message
)
...
...
lib/gitlab/git/blob.rb
浏览文件 @
a6af5522
...
...
@@ -58,7 +58,7 @@ module Gitlab
end
def
binary?
(
data
)
EncodingHelper
.
libgit2_binary?
(
data
)
EncodingHelper
.
detect_
libgit2_binary?
(
data
)
end
private
...
...
lib/gitlab/git/diff.rb
浏览文件 @
a6af5522
...
...
@@ -120,6 +120,8 @@ module Gitlab
# Return a binary diff message like:
#
# "Binary files a/file/path and b/file/path differ\n"
# This is used when we detect that a diff is binary
# using CharlockHolmes when Rugged treats it as text.
def
binary_message
(
old_path
,
new_path
)
"Binary files
#{
old_path
}
and
#{
new_path
}
differ
\n
"
end
...
...
@@ -198,7 +200,7 @@ module Gitlab
end
def
json_safe_diff
return
@diff
unless
all
_binary?
(
@diff
)
return
@diff
unless
detect
_binary?
(
@diff
)
# the diff is binary, let's make a message for it
Diff
.
binary_message
(
@old_path
,
@new_path
)
...
...
spec/requests/api/commits_spec.rb
浏览文件 @
a6af5522
...
...
@@ -673,6 +673,12 @@ describe API::Commits do
it_behaves_like
'ref diff'
end
end
context
'when binary diff are treated as text'
do
let
(
:commit_id
)
{
TestEnv
::
BRANCH_SHA
[
'add-pdf-text-binary'
]
}
it_behaves_like
'ref diff'
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录