diff options
Diffstat (limited to 'lib/graph_commit.rb')
| -rw-r--r-- | lib/graph_commit.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/graph_commit.rb b/lib/graph_commit.rb index 477f4f422e0..69368f7abe3 100644 --- a/lib/graph_commit.rb +++ b/lib/graph_commit.rb @@ -12,20 +12,20 @@ class GraphCommit @_commit.send(m, *args, &block) end - # Method is adding time and space on the - # list of commits. As well as returns date list + # 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 + # @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 + days[i] = c.committed_date map[c.id] = c heads += c.refs unless c.refs.nil? end @@ -35,7 +35,7 @@ class GraphCommit heads.sort! do |a,b| if a.name == "master" -1 - elsif b.name == "master" + elsif b.name == "master" 1 else b.commit.committed_date <=> a.commit.committed_date @@ -45,7 +45,7 @@ class GraphCommit j = 0 heads.each do |h| if map.include? h.commit.id then - j = mark_chain(j+=1, map[h.commit.id], map) + j = mark_chain(j+=1, map[h.commit.id], map) end end days @@ -55,15 +55,15 @@ class GraphCommit # # @param [Fixnum] space (row on the graph) to be set # @param [GraphCommit] the commit object. - # @param [Hash<String,GraphCommit>] map of commits + # @param [Hash<String,GraphCommit>] map of commits # - # @return [Fixnum] max space used. + # @return [Fixnum] max space used. def self.mark_chain(mark, commit, map) commit.space = mark if commit.space == 0 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 @@ -71,5 +71,5 @@ class GraphCommit marks << mark marks.compact.max end - + end |