Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1067b007
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,发现更多精彩内容 >>
提交
1067b007
编写于
9月 04, 2014
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Duplicate the behaviour and refactor for use with parallel diff.
上级
b54f2393
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
59 addition
and
6 deletion
+59
-6
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+7
-0
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+7
-6
lib/gitlab/diff_parser.rb
lib/gitlab/diff_parser.rb
+45
-0
未找到文件。
app/helpers/commits_helper.rb
浏览文件 @
1067b007
...
...
@@ -23,6 +23,13 @@ module CommitsHelper
end
end
def
side_diff_line
(
diff
,
index
)
Gitlab
::
DiffParser
.
new
(
diff
.
diff
.
lines
.
to_a
,
diff
.
new_path
)
.
each_for_parallel
do
|
full_line
,
type
,
line_code
,
line_new
,
line_old
,
next_line
|
yield
(
full_line
,
type
,
line_code
,
line_new
,
line_old
,
next_line
)
end
end
def
each_diff_line_near
(
diff
,
index
,
expected_line_code
)
max_number_of_lines
=
16
...
...
app/views/projects/commits/_parallel_view.html.haml
浏览文件 @
1067b007
/ Side-by-side diff view
%div
.text-file
%table
-
each_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
e
|
-
side_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
next_line
|
-
next
if
type
==
'new'
%tr
.line_holder.parallel
{
id:
line_code
,
class:
"#{type}"
}
-
if
type
!=
'match'
%td
.old_line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
id:
line_code
=
link_to
raw
(
line_old
),
"#
#{
line_code
}
"
,
id:
line_code
-
if
type
==
'old'
%td
.line_content
{
class:
"parallel noteable_line old #{line_code}"
,
"line_code"
=>
line_code
}=
line
%td
.line_content
{
class:
"parallel noteable_line old #{line_code}"
,
"line_code"
=>
line_code
}=
raw
line
-
else
%td
.line_content.parallel
=
line
%td
.new_line
{
data:
{
linenumber:
line_new
}}
=
link_to
raw
(
type
==
"old"
?
" "
:
line_new
)
,
"#
#{
line_code
}
"
,
id:
line_code
-
if
type
==
'
new
'
%td
.line_content.parallel
{
class:
"noteable_line
#{type} #{line_code}"
,
"line_code"
=>
line_code
}=
line
=
link_to
raw
(
line_new
)
,
"#
#{
line_code
}
"
,
id:
line_code
-
if
type
==
'
old
'
%td
.line_content.parallel
{
class:
"noteable_line
new #{line_code}"
,
"line_code"
=>
line_code
}=
raw
next_
line
-
else
%td
.line_content.parallel
=
line
lib/gitlab/diff_parser.rb
浏览文件 @
1067b007
...
...
@@ -50,6 +50,51 @@ module Gitlab
end
end
def
each_for_parallel
line_old
=
1
line_new
=
1
type
=
nil
lines_arr
=
::
Gitlab
::
InlineDiff
.
processing
lines
lines_arr
.
each_cons
(
2
)
do
|
line
,
next_line
|
raw_line
=
line
.
dup
next
if
filename?
(
line
)
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
full_line
=
::
Gitlab
::
InlineDiff
.
replace_markers
full_line
next_line
=
html_escape
(
next_line
.
gsub
(
/\n/
,
''
))
next_line
=
::
Gitlab
::
InlineDiff
.
replace_markers
next_line
if
line
.
match
(
/^@@ -/
)
type
=
"match"
line_old
=
line
.
match
(
/\-[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
line_new
=
line
.
match
(
/\+[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
next
if
line_old
==
1
&&
line_new
==
1
#top of file
yield
(
full_line
,
type
,
nil
,
line_new
,
line_old
)
next
else
type
=
identification_type
(
line
)
line_code
=
generate_line_code
(
new_path
,
line_new
,
line_old
)
yield
(
full_line
,
type
,
line_code
,
line_new
,
line_old
,
next_line
)
end
if
line
[
0
]
==
"+"
line_new
+=
1
elsif
line
[
0
]
==
"-"
line_old
+=
1
else
line_new
+=
1
line_old
+=
1
end
end
end
def
empty?
@lines
.
empty?
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录