Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b54f2393
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,发现更多精彩内容 >>
提交
b54f2393
编写于
9月 03, 2014
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Parallel diff in two columns.
上级
de6f4c31
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
35 deletion
+15
-35
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+15
-35
未找到文件。
app/views/projects/commits/_parallel_view.html.haml
浏览文件 @
b54f2393
/ Side-by-side diff view
/ Side-by-side diff view
-
old_lines
,
new_lines
=
parallel_diff_lines
(
project
,
@commit
,
diff
,
file
)
-
num_lines
=
old_lines
.
length
%div
.text-file
%div
.text-file
%table
%table
-
num_lines
.
times
do
|
index
|
-
each_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
,
e
|
-
new_line
=
new_lines
[
index
]
%tr
.line_holder.parallel
{
id:
line_code
,
class:
"#{type}"
}
-
old_line
=
old_lines
[
index
]
-
if
type
!=
'match'
%tr
.line_holder.parallel
%td
.old_line
-# For old line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
id:
line_code
-
if
old_line
.
type
==
:file_created
-
if
type
==
'old'
%td
.old_line
=
old_line
.
num
%td
.line_content
{
class:
"parallel noteable_line old #{line_code}"
,
"line_code"
=>
line_code
}=
line
%td
.line_content.parallel
=
"File was created"
-
else
-
elsif
old_line
.
type
==
:deleted
%td
.line_content.parallel
=
line
%td
.old_line.old
=
old_line
.
num
%td
.new_line
{
data:
{
linenumber:
line_new
}}
%td
.line_content
{
class:
"parallel noteable_line old #{old_line.code}"
,
"line_code"
=>
old_line
.
code
}=
old_line
.
content
=
link_to
raw
(
type
==
"old"
?
" "
:
line_new
)
,
"#
#{
line_code
}
"
,
id:
line_code
-
else
old_line
.
type
==
:no_change
-
if
type
==
'new'
%td
.old_line
=
old_line
.
num
%td
.line_content.parallel
{
class:
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
line
%td
.line_content.parallel
=
old_line
.
content
-
else
%td
.line_content.parallel
=
line
-# For new line
-
if
new_line
.
type
==
:file_deleted
%td
.new_line
=
new_line
.
num
%td
.line_content.parallel
=
"File was deleted"
-
elsif
new_line
.
type
==
:added
%td
.new_line.new
=
new_line
.
num
%td
.line_content
{
class:
"parallel noteable_line new #{new_line.code}"
,
"line_code"
=>
new_line
.
code
}=
new_line
.
content
-
else
new_line
.
type
==
:no_change
%td
.new_line
=
new_line
.
num
%td
.line_content.parallel
=
new_line
.
content
-
if
@reply_allowed
-
comments1
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
old_line
.
code
}.
sort_by
(
&
:created_at
)
-
comments2
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
new_line
.
code
}.
sort_by
(
&
:created_at
)
-
unless
comments1
.
empty?
and
comments2
.
empty?
=
render
"projects/notes/diff_notes_with_reply_parallel"
,
notes1:
comments1
,
notes2:
comments2
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录