2016-03-29 15:16:08 +05:30
|
|
|
var db = require('./gitGraphAst');
|
2016-03-31 10:40:35 +05:30
|
|
|
var _ = require('lodash');
|
2016-03-29 15:16:08 +05:30
|
|
|
var gitGraphParser = require('./parser/gitGraph');
|
2016-03-29 08:33:38 +05:30
|
|
|
var d3 = require('../../d3');
|
|
|
|
var Logger = require('../../logger');
|
|
|
|
|
|
|
|
var log = new Logger.Log();
|
2016-03-31 10:40:35 +05:30
|
|
|
var allCommitsDict = {};
|
2016-03-30 14:36:39 +05:30
|
|
|
exports.setConf = function (config) {
|
2016-03-29 15:16:08 +05:30
|
|
|
|
|
|
|
}
|
2016-03-29 08:33:38 +05:30
|
|
|
|
2016-03-31 10:40:35 +05:30
|
|
|
function svgCreateDefs(svg) {
|
|
|
|
svg.append("defs")
|
|
|
|
.append("circle")
|
|
|
|
.attr("id", "def-commit")
|
|
|
|
.attr("r", 15)
|
|
|
|
.attr("cx", 0)
|
|
|
|
.attr("cy", 0);
|
|
|
|
svg.select("defs")
|
|
|
|
.append("line")
|
|
|
|
.attr("id", "def-arrow-rl")
|
|
|
|
.attr("x1", 25)
|
|
|
|
.attr("y1", 0)
|
|
|
|
.attr("x2", -25)
|
|
|
|
.attr("y2", 0)
|
|
|
|
.attr("marker-end", "url(#triangle)");
|
|
|
|
}
|
|
|
|
function svgAddArrowMarker(svg) {
|
|
|
|
svg.append("marker")
|
|
|
|
.attr({
|
|
|
|
"id": "triangle",
|
|
|
|
"refX": "5",
|
|
|
|
"refY": "5",
|
|
|
|
"markerUnits": "strokeWidth",
|
|
|
|
"fill": "#666",
|
|
|
|
"markerWidth": "4",
|
|
|
|
"markerHeight": "3",
|
|
|
|
"orient": "auto",
|
|
|
|
"viewBox": "0,0,10,10"
|
|
|
|
})
|
|
|
|
.append("svg:path")
|
|
|
|
.attr("d", "M 0 0 L 10 5 L 0 10 z");
|
|
|
|
}
|
|
|
|
|
|
|
|
function svgDrawLine(svg, points) {
|
|
|
|
|
|
|
|
var lineGen = d3.svg.line()
|
|
|
|
.x(function(d) { return d.x })
|
|
|
|
.y(function(d) {return d.y})
|
2016-03-31 14:18:24 +05:30
|
|
|
.interpolate("basis");
|
2016-03-31 10:40:35 +05:30
|
|
|
|
|
|
|
svg
|
|
|
|
.append("svg:path")
|
|
|
|
.attr("d", lineGen(points))
|
|
|
|
.style("stroke", "grey")
|
|
|
|
.style("stroke-width", "2")
|
|
|
|
.style("fill", "none");
|
|
|
|
}
|
|
|
|
|
|
|
|
function svgDrawLineForCommits(svg, fromId, toId) {
|
|
|
|
log.debug("svgDrawLineForCommits: ", fromId, toId);
|
|
|
|
var fromBbox = svg.select("#node-" + fromId).node().getBBox();
|
|
|
|
var toBbox = svg.select("#node-" + toId).node().getBBox();
|
2016-03-31 14:44:36 +05:30
|
|
|
//log.debug("svgDrawLineForCommits: ", fromBbox, toBbox);
|
2016-03-31 10:40:35 +05:30
|
|
|
svgDrawLine(svg, [
|
|
|
|
{"x": fromBbox.x, "y": fromBbox.y + fromBbox.height/2 },
|
2016-03-31 14:18:24 +05:30
|
|
|
{"x": toBbox.x + (fromBbox.x - toBbox.x)/2, "y": fromBbox.y + fromBbox.height/2 },
|
|
|
|
{"x": toBbox.x + (fromBbox.x - toBbox.x)/2, "y": toBbox.y + toBbox.height/2 },
|
2016-03-31 10:40:35 +05:30
|
|
|
{"x": toBbox.x + toBbox.width, "y": toBbox.y + toBbox.height/2 }
|
|
|
|
]);
|
|
|
|
}
|
|
|
|
function renderCommitHistory(svg, commitid, branches, direction, branchNum) {
|
|
|
|
var commit;
|
|
|
|
branchNum = branchNum || 1;
|
|
|
|
if (_.isString(commitid)) {
|
|
|
|
do {
|
|
|
|
commit = allCommitsDict[commitid];
|
|
|
|
log.debug("in renderCommitHistory", commit.id, commit.seq);
|
|
|
|
if (svg.select("#node-" + commitid).size() > 0) return;
|
|
|
|
svg
|
|
|
|
.append("g")
|
|
|
|
.attr("class", "commit")
|
|
|
|
.attr("id", function() { return "node-" + commit.id; })
|
|
|
|
.append("use")
|
|
|
|
.attr("transform", function() {
|
|
|
|
return "translate(" + (commit.seq * 100 + 50 )+ ", " + (branchNum * 50)+")";
|
|
|
|
})
|
|
|
|
.attr("xlink:href", "#def-commit")
|
|
|
|
.attr("fill", "yellow")
|
|
|
|
.attr("stroke", "grey")
|
|
|
|
.attr("stroke-width", "2");
|
|
|
|
|
|
|
|
commitid = commit.parent
|
|
|
|
} while (commitid && allCommitsDict[commitid]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_.isArray(commitid)) {
|
|
|
|
log.debug("found merge commmit", commitid);
|
|
|
|
renderCommitHistory(svg, commitid[0], branches, direction, branchNum);
|
|
|
|
renderCommitHistory(svg, commitid[1], branches, direction, ++branchNum);
|
|
|
|
}
|
|
|
|
}
|
2016-03-31 14:44:36 +05:30
|
|
|
|
|
|
|
function renderLines(svg, commit) {
|
|
|
|
while (commit.seq > 0) {
|
|
|
|
if (_.isString(commit.parent)) {
|
|
|
|
svgDrawLineForCommits(svg, commit.id, commit.parent);
|
|
|
|
commit = allCommitsDict[commit.parent];
|
|
|
|
} else if (_.isArray(commit.parent)) {
|
|
|
|
svgDrawLineForCommits(svg, commit.id, commit.parent[0])
|
|
|
|
svgDrawLineForCommits(svg, commit.id, commit.parent[1])
|
|
|
|
renderLines(svg, allCommitsDict[commit.parent[1]]);
|
|
|
|
commit = allCommitsDict[commit.parent[0]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-29 08:33:38 +05:30
|
|
|
exports.draw = function (txt, id, ver) {
|
2016-03-30 14:36:39 +05:30
|
|
|
try {
|
2016-03-29 15:16:08 +05:30
|
|
|
var parser;
|
|
|
|
parser = gitGraphParser.parser;
|
|
|
|
parser.yy = db;
|
2016-03-29 08:33:38 +05:30
|
|
|
|
2016-03-29 15:16:08 +05:30
|
|
|
log.debug('in gitgraph renderer', txt, id, ver);
|
|
|
|
// Parse the graph definition
|
|
|
|
parser.parse(txt + "\n");
|
2016-03-30 14:36:39 +05:30
|
|
|
var direction = db.getDirection();
|
2016-03-29 20:55:22 +05:30
|
|
|
var commits = db.getCommitsArray();
|
2016-03-31 10:40:35 +05:30
|
|
|
allCommitsDict = db.getCommits();
|
|
|
|
var branches = db.getBranchesAsObjArray();
|
|
|
|
var commit = _.maxBy(commits, 'seq');
|
2016-03-30 14:36:39 +05:30
|
|
|
var svg = d3.select('#' + id);
|
2016-03-31 10:40:35 +05:30
|
|
|
svgAddArrowMarker(svg);
|
|
|
|
svgCreateDefs(svg);
|
2016-03-30 15:05:35 +05:30
|
|
|
var count = commits.length;
|
2016-03-29 08:33:38 +05:30
|
|
|
|
2016-03-31 10:40:35 +05:30
|
|
|
renderCommitHistory(svg, commit.id, branches, direction);
|
2016-03-31 14:44:36 +05:30
|
|
|
renderLines(svg, commit);
|
2016-03-29 08:33:38 +05:30
|
|
|
|
2016-03-30 14:36:39 +05:30
|
|
|
svg.attr('height', 900);
|
|
|
|
svg.attr('width', 1200);
|
|
|
|
} catch (e) {
|
2016-03-29 15:16:08 +05:30
|
|
|
log.error("Error while rendering gitgraph");
|
|
|
|
log.error(e.message);
|
|
|
|
}
|
2016-03-29 08:33:38 +05:30
|
|
|
};
|