marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-17 06:20:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle multiple branches; handle unmerged branches

Browse Source
This commit is contained in:
Raghu Rajagopalan
2016-03-31 15:47:38 +05:30
parent 0d6d848325
commit 942bd02add
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/www/javascripts/lib/mermaid.js vendored
View File

@@ -53610,7 +53610,7 @@ function svgDrawLine(svg, points) {
return d.y; return d.y;
}).interpolate("basis"); }).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) { function svgDrawLineForCommits(svg, fromId, toId) {
@@ -53669,17 +53669,17 @@ exports.draw = function (txt, id, ver) {
// Parse the graph definition // Parse the graph definition
parser.parse(txt + "\n"); parser.parse(txt + "\n");
var direction = db.getDirection(); var direction = db.getDirection();
var commits = db.getCommitsArray();
allCommitsDict = db.getCommits(); allCommitsDict = db.getCommits();
var branches = db.getBranchesAsObjArray(); var branches = db.getBranchesAsObjArray();
var commit = _.maxBy(commits, 'seq');
var svg = d3.select('#' + id); var svg = d3.select('#' + id);
svgAddArrowMarker(svg); svgAddArrowMarker(svg);
svgCreateDefs(svg); svgCreateDefs(svg);
var count = commits.length; var branchNum = 0;
_.each(branches, function (v, k) {
renderCommitHistory(svg, commit.id, branches, direction); renderCommitHistory(svg, v.commit.id, branches, direction, branchNum);
renderLines(svg, commit); renderLines(svg, v.commit);
branchNum++;
});
svg.attr('height', 900); svg.attr('height', 900);
svg.attr('width', 1200); svg.attr('width', 1200);

14
src/diagrams/gitGraph/gitGraphRenderer.js
View File

@@ -54,7 +54,7 @@ function svgDrawLine(svg, points) {
.append("svg:path") .append("svg:path")
.attr("d", lineGen(points)) .attr("d", lineGen(points))
.style("stroke", "grey") .style("stroke", "grey")
.style("stroke-width", "2") .style("stroke-width", "4")
.style("fill", "none"); .style("fill", "none");
} }
@@ -126,17 +126,17 @@ exports.draw = function (txt, id, ver) {
// Parse the graph definition // Parse the graph definition
parser.parse(txt + "\n"); parser.parse(txt + "\n");
var direction = db.getDirection(); var direction = db.getDirection();
var commits = db.getCommitsArray();
allCommitsDict = db.getCommits(); allCommitsDict = db.getCommits();
var branches = db.getBranchesAsObjArray(); var branches = db.getBranchesAsObjArray();
var commit = _.maxBy(commits, 'seq');
var svg = d3.select('#' + id); var svg = d3.select('#' + id);
svgAddArrowMarker(svg); svgAddArrowMarker(svg);
svgCreateDefs(svg); svgCreateDefs(svg);
var count = commits.length; var branchNum = 0;
_.each(branches, function(v, k) {
renderCommitHistory(svg, commit.id, branches, direction); renderCommitHistory(svg, v.commit.id, branches, direction, branchNum);
renderLines(svg, commit); renderLines(svg, v.commit);
branchNum++;
})
svg.attr('height', 900); svg.attr('height', 900);
svg.attr('width', 1200); svg.attr('width', 1200);

1
testgitgraph.mm
View File

@@ -16,4 +16,3 @@ gitGraph :
commit commit
checkout newbranch checkout newbranch
merge master merge master
merge other