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

Graph: small refactoring

Browse source
This commit is contained in:
Valery Sizov 2011-11-13 15:31:18 +02:00
parent c89682605f
commit dc844f0138
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/projects_controller.rb
View file

@ -181,7 +181,10 @@ class ProjectsController < ApplicationController
def add_refs(commit, ref_cache)
if ref_cache.empty?
@repo.refs.each {|ref| ref_cache[ref.commit.id] ||= [];ref_cache[ref.commit.id] << ref}
@repo.refs.each do |ref|
ref_cache[ref.commit.id] ||= []
ref_cache[ref.commit.id] << ref
end
end
commit.refs = ref_cache[commit.id] if ref_cache.include? commit.id
commit.refs ||= []

11
lib/graph_commit.rb
View file

@ -25,7 +25,7 @@ class GraphCommit
commits.reverse.each_with_index do |c,i|
c.time = i
days[i]=c.committed_date
days[i] = c.committed_date
map[c.id] = c
heads += c.refs unless c.refs.nil?
end
@ -63,7 +63,7 @@ class GraphCommit
m1 = mark - 1
marks = commit.parents.collect do |p|
if map.include? p.id and map[p.id].space == 0 then
mark_chain(m1+=1, map[p.id],map)
mark_chain(m1 += 1, map[p.id],map)
else
m1 + 1
end
@ -72,11 +72,4 @@ class GraphCommit
marks.compact.max
end
def self.add_refs(commit, ref_cache)
if ref_cache.empty?
@repo.refs.each {|ref| ref_cache[ref.commit.id] ||= [];ref_cache[ref.commit.id] << ref}
end
commit.refs = ref_cache[commit.id] if ref_cache.include? commit.id
commit.refs ||= []
end
end