BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d4059ac9 by randx
Options

Move graph_commit under gitlab module

parent 05c86fb0
Showing with 149 additions and 147 deletions
app/controllers/projects_controller.rb
require File.join(Rails.root, 'lib', 'graph_commit') require Rails.root.join('lib', 'gitlab', 'graph_commit')
class ProjectsController < ApplicationController class ProjectsController < ApplicationController
before_filter :project, except: [:index, :new, :create] before_filter :project, except: [:index, :new, :create]
...@@ -78,7 +78,7 @@ class ProjectsController < ApplicationController ...@@ -78,7 +78,7 @@ class ProjectsController < ApplicationController
end end
def graph def graph
@days_json, @commits_json = GraphCommit.to_graph(project) @days_json, @commits_json = Gitlab::GraphCommit.to_graph(project)
end end
def destroy def destroy
......
lib/graph_commit.rb → lib/gitlab/graph_commit.rb
require "grit" require "grit"
class GraphCommit module Gitlab
attr_accessor :time, :space class GraphCommit
attr_accessor :refs attr_accessor :time, :space
attr_accessor :refs
def self.to_graph(project) def self.to_graph(project)
@repo = project.repo @repo = project.repo
commits = Grit::Commit.find_all(@repo, nil, {max_count: 650}) commits = Grit::Commit.find_all(@repo, nil, {max_count: 650})
ref_cache = {} ref_cache = {}
commits.map! {|c| GraphCommit.new(Commit.new(c))} commits.map! {|c| GraphCommit.new(Commit.new(c))}
commits.each { |commit| commit.add_refs(ref_cache, @repo) } commits.each { |commit| commit.add_refs(ref_cache, @repo) }
days = GraphCommit.index_commits(commits) days = GraphCommit.index_commits(commits)
@days_json = days.compact.collect{|d| [d.day, d.strftime("%b")] }.to_json @days_json = days.compact.collect{|d| [d.day, d.strftime("%b")] }.to_json
@commits_json = commits.map(&:to_graph_hash).to_json @commits_json = commits.map(&:to_graph_hash).to_json
return @days_json, @commits_json return @days_json, @commits_json
end
# Method is adding time and space on the
# list of commits. As well as returns date list
# corelated with time set on commits.
#
# @param [Array<GraphCommit>] comits to index
#
# @return [Array<TimeDate>] list of commit dates corelated with time on commits
def self.index_commits(commits)
days, heads = [], []
map = {}
commits.reverse.each_with_index do |c,i|
c.time = i
days[i] = c.committed_date
map[c.id] = c
heads += c.refs unless c.refs.nil?
end end
heads.select!{|h| h.is_a? Grit::Head or h.is_a? Grit::Remote} # Method is adding time and space on the
# sort heads so the master is top and current branches are closer # list of commits. As well as returns date list
heads.sort! do |a,b| # corelated with time set on commits.
if a.name == "master" #
-1 # @param [Array<GraphCommit>] comits to index
elsif b.name == "master" #
1 # @return [Array<TimeDate>] list of commit dates corelated with time on commits
else def self.index_commits(commits)
b.commit.committed_date <=> a.commit.committed_date days, heads = [], []
map = {}
commits.reverse.each_with_index do |c,i|
c.time = i
days[i] = c.committed_date
map[c.id] = c
heads += c.refs unless c.refs.nil?
end end
end
@_reserved = {} heads.select!{|h| h.is_a? Grit::Head or h.is_a? Grit::Remote}
days.each_index do |i| # sort heads so the master is top and current branches are closer
@_reserved[i] = [] heads.sort! do |a,b|
end if a.name == "master"
-1
elsif b.name == "master"
1
else
b.commit.committed_date <=> a.commit.committed_date
end
end
heads.each do |h| @_reserved = {}
if map.include? h.commit.id then days.each_index do |i|
place_chain(map[h.commit.id], map) @_reserved[i] = []
end end
end
days
end
# Add space mark on commit and its parents heads.each do |h|
# if map.include? h.commit.id then
# @param [GraphCommit] the commit object. place_chain(map[h.commit.id], map)
# @param [Hash<String,GraphCommit>] map of commits
def self.place_chain(commit, map, parent_time = nil)
leaves = take_left_leaves(commit, map)
if leaves.empty? then
return
end
space = find_free_space(leaves.last.time..leaves.first.time)
leaves.each{|l| l.space = space}
# and mark it as reserved
min_time = leaves.last.time
parents = leaves.last.parents.collect
parents.each do |p|
if map.include? p.id then
parent = map[p.id]
if parent.time < min_time then
min_time = parent.time
end end
end end
days
end end
if parent_time.nil? then
max_time = leaves.first.time # Add space mark on commit and its parents
else #
max_time = parent_time - 1 # @param [GraphCommit] the commit object.
end # @param [Hash<String,GraphCommit>] map of commits
mark_reserved(min_time..max_time, space) def self.place_chain(commit, map, parent_time = nil)
# Visit branching chains leaves = take_left_leaves(commit, map)
leaves.each do |l| if leaves.empty? then
parents = l.parents.collect return
.select{|p| map.include? p.id and map[p.id].space == 0} end
for p in parents space = find_free_space(leaves.last.time..leaves.first.time)
place_chain(map[p.id], map, l.time) leaves.each{|l| l.space = space}
# and mark it as reserved
min_time = leaves.last.time
parents = leaves.last.parents.collect
parents.each do |p|
if map.include? p.id then
parent = map[p.id]
if parent.time < min_time then
min_time = parent.time
end
end
end
if parent_time.nil? then
max_time = leaves.first.time
else
max_time = parent_time - 1
end
mark_reserved(min_time..max_time, space)
# Visit branching chains
leaves.each do |l|
parents = l.parents.collect
.select{|p| map.include? p.id and map[p.id].space == 0}
for p in parents
place_chain(map[p.id], map, l.time)
end
end end
end end
end
def self.mark_reserved(time_range, space) def self.mark_reserved(time_range, space)
for day in time_range for day in time_range
@_reserved[day].push(space) @_reserved[day].push(space)
end
end end
end
def self.find_free_space(time_range) def self.find_free_space(time_range)
reserved = [] reserved = []
for day in time_range for day in time_range
reserved += @_reserved[day] reserved += @_reserved[day]
end end
space = 1 space = 1
while reserved.include? space do while reserved.include? space do
space += 1 space += 1
end
space
end end
space
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.
# #
# @param [GraphCommit] the commit object. # @param [GraphCommit] the commit object.
# @param [Hash<String,GraphCommit>] map of commits # @param [Hash<String,GraphCommit>] map of commits
# #
# @return [Array<GraphCommit>] list of branch commits # @return [Array<GraphCommit>] list of branch commits
def self.take_left_leaves(commit, map) def self.take_left_leaves(commit, map)
leaves = [] leaves = []
leaves.push(commit) if commit.space == 0 leaves.push(commit) if commit.space == 0
while true while true
parent = commit.parents.collect parent = commit.parents.collect
.select{|p| map.include? p.id and map[p.id].space == 0} .select{|p| map.include? p.id and map[p.id].space == 0}
if parent.count == 0 then if parent.count == 0 then
return leaves return leaves
else else
commit = map[parent.first.id] commit = map[parent.first.id]
leaves.push(commit) leaves.push(commit)
end
end end
end end
end
def initialize(commit) def initialize(commit)
@_commit = commit @_commit = commit
@time = -1 @time = -1
@space = 0 @space = 0
end end
def method_missing(m, *args, &block) def method_missing(m, *args, &block)
@_commit.send(m, *args, &block) @_commit.send(m, *args, &block)
end end
def to_graph_hash def to_graph_hash
h = {} h = {}
h[:parents] = self.parents.collect do |p| h[:parents] = self.parents.collect do |p|
[p.id,0,0] [p.id,0,0]
end
h[:author] = Gitlab::Encode.utf8(author.name)
h[:time] = time
h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha
h[:date] = date
h[:message] = Gitlab::Encode.utf8(message)
h[:login] = author.email
h
end end
h[:author] = Gitlab::Encode.utf8(author.name)
h[:time] = time
h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha
h[:date] = date
h[:message] = Gitlab::Encode.utf8(message)
h[:login] = author.email
h
end
def add_refs(ref_cache, repo) def add_refs(ref_cache, repo)
if ref_cache.empty? if ref_cache.empty?
repo.refs.each do |ref| repo.refs.each do |ref|
ref_cache[ref.commit.id] ||= [] ref_cache[ref.commit.id] ||= []
ref_cache[ref.commit.id] << ref ref_cache[ref.commit.id] << ref
end
end end
@refs = ref_cache[@_commit.id] if ref_cache.include?(@_commit.id)
@refs ||= []
end end
@refs = ref_cache[@_commit.id] if ref_cache.include?(@_commit.id)
@refs ||= []
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment