Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
56000aea
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,发现更多精彩内容 >>
提交
56000aea
编写于
1月 31, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
Fix bug of network graph(#2847) and trivial code clean up.
上级
2af323bb
41332212
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
9 deletion
+16
-9
lib/gitlab/graph/json_builder.rb
lib/gitlab/graph/json_builder.rb
+15
-8
vendor/assets/javascripts/branch-graph.js
vendor/assets/javascripts/branch-graph.js
+1
-1
未找到文件。
lib/gitlab/graph/json_builder.rb
浏览文件 @
56000aea
...
...
@@ -109,9 +109,9 @@ module Gitlab
end
space
=
if
commit
.
space
>=
parent
.
space
then
find_free_parent_space
(
range
,
map
,
parent
.
space
,
1
,
commit
.
space
,
times
)
find_free_parent_space
(
range
,
parent
.
space
,
1
,
commit
.
space
,
times
)
else
find_free_parent_space
(
range
,
map
,
parent
.
space
,
-
1
,
parent
.
space
,
times
)
find_free_parent_space
(
range
,
parent
.
space
,
-
1
,
parent
.
space
,
times
)
end
mark_reserved
(
range
,
space
)
...
...
@@ -122,9 +122,9 @@ module Gitlab
spaces
end
def
find_free_parent_space
(
range
,
map
,
space_base
,
space_step
,
space_default
,
times
)
def
find_free_parent_space
(
range
,
space_base
,
space_step
,
space_default
,
times
)
if
is_overlap?
(
range
,
times
,
space_default
)
then
find_free_space
(
range
,
map
,
space_base
,
space_step
)
find_free_space
(
range
,
space_base
,
space_step
)
else
space_default
end
...
...
@@ -152,11 +152,9 @@ module Gitlab
if
leaves
.
empty?
return
end
time_range
=
leaves
.
last
.
time
..
leaves
.
first
.
time
space
=
find_free_space
(
time_range
,
map
,
1
,
2
)
leaves
.
each
{
|
l
|
l
.
space
=
space
}
# and mark it as reserved
min_time
=
leaves
.
last
.
time
max_space
=
1
parents
=
leaves
.
last
.
parents
.
collect
parents
.
each
do
|
p
|
if
map
.
include?
p
.
id
...
...
@@ -164,6 +162,9 @@ module Gitlab
if
parent
.
time
<
min_time
min_time
=
parent
.
time
end
if
max_space
<
parent
.
space
then
max_space
=
parent
.
space
end
end
end
if
parent_time
.
nil?
...
...
@@ -171,6 +172,11 @@ module Gitlab
else
max_time
=
parent_time
-
1
end
time_range
=
leaves
.
last
.
time
..
leaves
.
first
.
time
space
=
find_free_space
(
time_range
,
max_space
,
2
)
leaves
.
each
{
|
l
|
l
.
space
=
space
}
mark_reserved
(
min_time
..
max_time
,
space
)
# Visit branching chains
...
...
@@ -188,11 +194,12 @@ module Gitlab
end
end
def
find_free_space
(
time_range
,
map
,
space_base
,
space_step
)
def
find_free_space
(
time_range
,
space_base
,
space_step
)
reserved
=
[]
for
day
in
time_range
reserved
+=
@_reserved
[
day
]
end
reserved
.
uniq!
space
=
space_base
while
reserved
.
include?
(
space
)
do
...
...
vendor/assets/javascripts/branch-graph.js
浏览文件 @
56000aea
...
...
@@ -122,7 +122,7 @@
var
cx
=
offsetX
+
20
*
c
.
time
,
cy
=
offsetY
+
10
*
c
.
space
,
psy
=
offsetY
+
10
*
ps
;
if
(
c
.
space
==
this
.
commits
[
i
].
space
)
{
if
(
c
.
space
==
this
.
commits
[
i
].
space
&&
c
.
space
==
ps
)
{
r
.
path
([
"
M
"
,
x
,
y
,
"
L
"
,
cx
,
cy
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录