deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve network graph

Browse source
This commit is contained in:
Sato Hiroyuki 2013-01-23 21:34:19 +09:00 committed by GitLab
parent 65737bd5bd
commit 70687cd581
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/gitlab/graph/json_builder.rb
View file

@ -16,6 +16,7 @@ module Gitlab
@commits = collect_commits @commits = collect_commits
@days = index_commits @days = index_commits
@space = 0
end end
def to_json(*args) def to_json(*args)
@ -97,8 +98,8 @@ module Gitlab
if leaves.empty? if leaves.empty?
return return
end end
space = find_free_space(leaves, map) @space = find_free_space(leaves, map)
leaves.each{|l| l.space = space} leaves.each{|l| l.space = @space}
# and mark it as reserved # and mark it as reserved
min_time = leaves.last.time min_time = leaves.last.time
parents = leaves.last.parents.collect parents = leaves.last.parents.collect
@ -115,7 +116,7 @@ module Gitlab
else else
max_time = parent_time - 1 max_time = parent_time - 1
end end
mark_reserved(min_time..max_time, space) mark_reserved(min_time..max_time, @space)
# Visit branching chains # Visit branching chains
leaves.each do |l| leaves.each do |l|
@ -139,9 +140,10 @@ module Gitlab
reserved += @_reserved[day] reserved += @_reserved[day]
end end
space = base_space(leaves, map) space = base_space(leaves, map)
while reserved.include? space do while (reserved.include? space) || (space == @space) do
space += 1 space += 1
end end
space space
end end

2
vendor/assets/javascripts/branch-graph.js vendored
View file

@ -121,7 +121,7 @@
if (c.space == this.commits[i].space) { if (c.space == this.commits[i].space) {
r.path([ r.path([
"M", x, y, "M", x, y,
"L", x - 20 * (c.time + 1), y "L", cx, cy
]).attr({ ]).attr({
stroke: this.colors[c.space], stroke: this.colors[c.space],
"stroke-width": 2 "stroke-width": 2