From 942bd02add1b4751a137b9706a0658d0712d5ed4 Mon Sep 17 00:00:00 2001
From: Raghu Rajagopalan <raghu.rajagopalan@gmail.com>
Date: Thu, 31 Mar 2016 15:47:38 +0530
Subject: [PATCH] handle multiple branches; handle unmerged branches

---
 dist/www/javascripts/lib/mermaid.js       | 14 +++++++-------
 src/diagrams/gitGraph/gitGraphRenderer.js | 14 +++++++-------
 testgitgraph.mm                           |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dist/www/javascripts/lib/mermaid.js b/dist/www/javascripts/lib/mermaid.js
index 30e1dd8e5..320833c12 100644
--- a/dist/www/javascripts/lib/mermaid.js
+++ b/dist/www/javascripts/lib/mermaid.js
@@ -53610,7 +53610,7 @@ function svgDrawLine(svg, points) {
         return d.y;
     }).interpolate("basis");
 
-    svg.append("svg:path").attr("d", lineGen(points)).style("stroke", "grey").style("stroke-width", "2").style("fill", "none");
+    svg.append("svg:path").attr("d", lineGen(points)).style("stroke", "grey").style("stroke-width", "4").style("fill", "none");
 }
 
 function svgDrawLineForCommits(svg, fromId, toId) {
@@ -53669,17 +53669,17 @@ exports.draw = function (txt, id, ver) {
         // Parse the graph definition
         parser.parse(txt + "\n");
         var direction = db.getDirection();
-        var commits = db.getCommitsArray();
         allCommitsDict = db.getCommits();
         var branches = db.getBranchesAsObjArray();
-        var commit = _.maxBy(commits, 'seq');
         var svg = d3.select('#' + id);
         svgAddArrowMarker(svg);
         svgCreateDefs(svg);
-        var count = commits.length;
-
-        renderCommitHistory(svg, commit.id, branches, direction);
-        renderLines(svg, commit);
+        var branchNum = 0;
+        _.each(branches, function (v, k) {
+            renderCommitHistory(svg, v.commit.id, branches, direction, branchNum);
+            renderLines(svg, v.commit);
+            branchNum++;
+        });
 
         svg.attr('height', 900);
         svg.attr('width', 1200);
diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js
index e9d9b7afa..27ce26be2 100644
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -54,7 +54,7 @@ function svgDrawLine(svg, points) {
     .append("svg:path")
     .attr("d", lineGen(points))
     .style("stroke", "grey")
-    .style("stroke-width", "2")
+    .style("stroke-width", "4")
     .style("fill", "none");
 }
 
@@ -126,17 +126,17 @@ exports.draw = function (txt, id, ver) {
         // Parse the graph definition
         parser.parse(txt + "\n");
         var direction = db.getDirection();
-        var commits = db.getCommitsArray();
         allCommitsDict = db.getCommits();
         var branches = db.getBranchesAsObjArray();
-        var commit = _.maxBy(commits, 'seq');
         var svg = d3.select('#' + id);
         svgAddArrowMarker(svg);
         svgCreateDefs(svg);
-        var count = commits.length;
-
-        renderCommitHistory(svg, commit.id, branches, direction);
-        renderLines(svg, commit);
+        var branchNum = 0;
+        _.each(branches, function(v, k) {
+            renderCommitHistory(svg, v.commit.id, branches, direction, branchNum);
+            renderLines(svg, v.commit);
+            branchNum++;
+        })
 
         svg.attr('height', 900);
         svg.attr('width', 1200);
diff --git a/testgitgraph.mm b/testgitgraph.mm
index 0ea76dd50..b3b599b8a 100644
--- a/testgitgraph.mm
+++ b/testgitgraph.mm
@@ -16,4 +16,3 @@ gitGraph :
     commit
     checkout newbranch
     merge master
-    merge other