Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f827482c
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,发现更多精彩内容 >>
提交
f827482c
编写于
9月 04, 2014
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove duplication, expand for next_line.
上级
1067b007
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
46 deletion
+12
-46
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+2
-2
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+5
-2
app/views/projects/commits/diffs/_match_line_parallel.html.haml
...ews/projects/commits/diffs/_match_line_parallel.html.haml
+4
-0
lib/gitlab/diff_parser.rb
lib/gitlab/diff_parser.rb
+1
-42
未找到文件。
app/helpers/commits_helper.rb
浏览文件 @
f827482c
...
...
@@ -25,8 +25,8 @@ module CommitsHelper
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
)
.
each
do
|
full_line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
next_line
|
yield
(
full_line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
next_line
)
end
end
...
...
app/views/projects/commits/_parallel_view.html.haml
浏览文件 @
f827482c
/ Side-by-side diff view
%div
.text-file
%table
-
side_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
next_line
|
-
side_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
next_line
|
-
next
if
type
==
'new'
%tr
.line_holder.parallel
{
id:
line_code
,
class:
"#{type}"
}
-
if
type
!=
'match'
-
if
type
==
"match"
=
render
"projects/commits/diffs/match_line_parallel"
,
{
line:
line
,
line_old:
line_old
,
line_new:
line_new
,
bottom:
false
}
-
else
%td
.old_line
=
link_to
raw
(
line_old
),
"#
#{
line_code
}
"
,
id:
line_code
-
if
type
==
'old'
...
...
app/views/projects/commits/diffs/_match_line_parallel.html.haml
0 → 100644
浏览文件 @
f827482c
%td
.old_line
%td
.line_content.parallel.matched
=
line
%td
.new_line
%td
.line_content.parallel.matched
=
line
lib/gitlab/diff_parser.rb
浏览文件 @
f827482c
...
...
@@ -14,47 +14,6 @@ module Gitlab
line_new
=
1
type
=
nil
lines_arr
=
::
Gitlab
::
InlineDiff
.
processing
lines
lines_arr
.
each
do
|
line
|
raw_line
=
line
.
dup
next
if
filename?
(
line
)
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
full_line
=
::
Gitlab
::
InlineDiff
.
replace_markers
full_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
,
raw_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
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
|
...
...
@@ -80,7 +39,7 @@ module Gitlab
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
)
yield
(
full_line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
next_line
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录