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

Merge pull request #2260 from hiroponz/improve-network-graph

Browse source 
Improve network-graph
This commit is contained in:
Dmitriy Zaporozhets 2012-12-23 10:24:43 -08:00
parent 6a932d0af5 5fd830f01c
commit a5d7a95893
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ module Gitlab
if leaves.empty? if leaves.empty?
return return
end end
space = find_free_space(leaves.last.time..leaves.first.time) 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
@ -119,7 +119,7 @@ module Gitlab
# Visit branching chains # Visit branching chains
leaves.each do |l| leaves.each do |l|
parents = l.parents.collect.select{|p| map.include? p.id and map[p.id].space == 0} parents = l.parents.collect.select{|p| map.include? p.id and map[p.id].space.zero?}
for p in parents for p in parents
place_chain(map[p.id], map, l.time) place_chain(map[p.id], map, l.time)
end end
@ -132,18 +132,29 @@ module Gitlab
end end
end end
def find_free_space(time_range) def find_free_space(leaves, map)
time_range = leaves.last.time..leaves.first.time
reserved = [] reserved = []
for day in time_range for day in time_range
reserved += @_reserved[day] reserved += @_reserved[day]
end end
space = 1 space = base_space(leaves, map)
while reserved.include? space do while reserved.include? space do
space += 1 space += 1
end end
space space
end end
def base_space(leaves, map)
parents = []
leaves.each do |l|
parents.concat l.parents.collect.select{|p| map.include? p.id and map[p.id].space.nonzero?}
end
space = parents.map{|p| map[p.id].space}.max || 0
space += 1
end
# Takes most left subtree branch of commits # Takes most left subtree branch of commits
# which don't have space mark yet. # which don't have space mark yet.
# #
@ -156,13 +167,13 @@ module Gitlab
leaves.push(commit) if commit.space.zero? leaves.push(commit) if commit.space.zero?
while true while true
parent = commit.parents.collect.select do |p| return leaves if commit.parents.count.zero?
map.include? p.id and map[p.id].space == 0 return leaves unless map.include? commit.parents.first.id
end
return leaves if parent.count.zero? commit = map[commit.parents.first.id]
return leaves unless commit.space.zero?
commit = map[parent.first.id]
leaves.push(commit) leaves.push(commit)
end end
end end