From 5d98eb6ece8562d80147616cbee55caaa8263329 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 3 Nov 2011 11:36:12 +0000
Subject: scm: git: mercurial: add a new feature of revision graph (#5501)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7725 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb              | 56 +++++++++++++++++++++++++
 app/views/repositories/_revision_graph.html.erb | 13 ++++++
 app/views/repositories/_revisions.html.erb      | 29 ++++++++++++-
 3 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/views/repositories/_revision_graph.html.erb

(limited to 'app')

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 8954ac594..69f2e2558 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -283,4 +283,60 @@ module RepositoriesHelper
                         ) +
                      '<br />'.html_safe + l(:text_scm_path_encoding_note))
   end
+
+  def index_commits(commits, heads, href_proc = nil)
+    return nil if commits.nil? or commits.first.parents.nil?
+    map  = {}
+    commit_hashes = []
+    refs_map = {}
+    href_proc ||= Proc.new {|x|x}
+    heads.each{|r| refs_map[r.scmid] ||= []; refs_map[r.scmid] << r}
+    commits.reverse.each_with_index do |c, i|
+      h = {}
+      h[:parents] = c.parents.collect do |p|
+        [p.scmid, 0, 0]
+      end
+      h[:rdmid] = i
+      h[:space] = 0
+      h[:refs]  = refs_map[c.scmid].join(" ") if refs_map.include? c.scmid
+      h[:scmid] = c.scmid
+      h[:href]  = href_proc.call(c.scmid)
+      commit_hashes << h
+      map[c.scmid] = h
+    end
+    heads.sort! do |a,b|
+      a.to_s <=> b.to_s
+    end
+    j = 0
+    heads.each do |h|
+      if map.include? h.scmid then
+        j = mark_chain(j += 1, map[h.scmid], map)
+      end
+    end
+    # when no head matched anything use first commit
+    if j == 0 then
+       mark_chain(j += 1, map.values.first, map)
+    end
+    map
+  end
+
+  def mark_chain(mark, commit, map)
+    stack = [[mark, commit]]
+    markmax = mark
+    until stack.empty?
+      current = stack.pop
+      m, commit = current
+      commit[:space] = m  if commit[:space] == 0
+      m1 = m - 1
+      commit[:parents].each_with_index do |p, i|
+        psha = p[0]
+        if map.include? psha  and  map[psha][:space] == 0 then
+          stack << [m1 += 1, map[psha]] if i == 0
+          stack = [[m1 += 1, map[psha]]] + stack if i > 0
+        end
+      end
+      markmax = m1 if markmax < m1
+    end
+    markmax
+  end
 end
diff --git a/app/views/repositories/_revision_graph.html.erb b/app/views/repositories/_revision_graph.html.erb
new file mode 100644
index 000000000..02e26de14
--- /dev/null
+++ b/app/views/repositories/_revision_graph.html.erb
@@ -0,0 +1,13 @@
+<%= javascript_include_tag "raphael.js" %>
+<script type="text/javascript" charset="utf-8">
+  var chunk = {commits:<%= commits.values.to_json %>}
+</script>
+<%= javascript_include_tag "revision_graph.js" %>
+
+<script type="text/javascript">
+  window.onload = function(){
+    branchGraph(document.getElementById("holder"));
+  }
+</script>
+
+<div id="holder" class="graph"></div>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index a78e00fda..2bc72f84d 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -1,6 +1,9 @@
 <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
 <table class="list changesets">
 <thead><tr>
+<% if @repository.supports_revision_graph? %>
+<th></th>
+<% end %>
 <th>#</th>
 <th></th>
 <th></th>
@@ -13,12 +16,36 @@
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
 <tr class="changeset <%= cycle 'odd', 'even' %>">
+<% if @repository.supports_revision_graph? %>
+  <% if line_num == 1 %>
+    <td class="revision_graph" rowspan="<%= revisions.size %>">
+      <% href_base = Proc.new {|x| url_for(:controller => 'repositories',
+                                           :action => 'revision',
+                                           :id => project,
+                                           :rev => x) } %>
+      <%= render :partial => 'revision_graph',
+                 :locals => {
+                    :commits => index_commits(
+                                         revisions,
+                                         @repository.branches,
+                                         href_base
+                                            )
+                    } %>
+    </td>
+  <% end %>
+<% end %>
 <td class="id"><%= link_to_revision(changeset, project) %></td>
 <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
 <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
-<td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
+<% if @repository.supports_revision_graph? %>
+  <td class="comments_nowrap">
+    <%= textilizable(truncate(truncate_at_line_break(changeset.comments, 0), :length => 90)) %>
+  </td>
+<% else %>
+  <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
+<% end %>
 </tr>
 <% line_num += 1 %>
 <% end %>
-- 
cgit v1.2.3