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

Change logger to log

Browse Source
This commit is contained in:
harshilparmar
2021-02-06 15:56:05 +05:30
parent edd7bc7197
commit 7019a1149d
41 changed files with 366 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/diagrams/git/gitGraphAst.js
View File

@@ -1,4 +1,4 @@
import { logger } from '../../logger';
import { log } from '../../logger';
import { random } from '../../utils';
let commits = {};
let head = null;
@@ -12,12 +12,12 @@ function getId() {
}
function isfastforwardable(currentCommit, otherCommit) {
logger.debug('Entering isfastforwardable:', currentCommit.id, otherCommit.id);
log.debug('Entering isfastforwardable:', currentCommit.id, otherCommit.id);
while (currentCommit.seq <= otherCommit.seq && currentCommit !== otherCommit) {
// only if other branch has more commits
if (otherCommit.parent == null) break;
if (Array.isArray(otherCommit.parent)) {
logger.debug('In merge commit:', otherCommit.parent);
log.debug('In merge commit:', otherCommit.parent);
return (
isfastforwardable(currentCommit, commits[otherCommit.parent[0]]) ||
isfastforwardable(currentCommit, commits[otherCommit.parent[1]])
@@ -26,7 +26,7 @@ function isfastforwardable(currentCommit, otherCommit) {
otherCommit = commits[otherCommit.parent];
}
}
logger.debug(currentCommit.id, otherCommit.id);
log.debug(currentCommit.id, otherCommit.id);
return currentCommit.id === otherCommit.id;
}
@@ -54,13 +54,13 @@ export const setDirection = function(dir) {
};
let options = {};
export const setOptions = function(rawOptString) {
logger.debug('options str', rawOptString);
log.debug('options str', rawOptString);
rawOptString = rawOptString && rawOptString.trim();
rawOptString = rawOptString || '{}';
try {
options = JSON.parse(rawOptString);
} catch (e) {
logger.error('error while parsing gitGraph options', e.message);
log.error('error while parsing gitGraph options', e.message);
}
};
@@ -78,19 +78,19 @@ export const commit = function(msg) {
head = commit;
commits[commit.id] = commit;
branches[curBranch] = commit.id;
logger.debug('in pushCommit ' + commit.id);
log.debug('in pushCommit ' + commit.id);
};
export const branch = function(name) {
branches[name] = head != null ? head.id : null;
logger.debug('in createBranch');
log.debug('in createBranch');
};
export const merge = function(otherBranch) {
const currentCommit = commits[branches[curBranch]];
const otherCommit = commits[branches[otherBranch]];
if (isReachableFrom(currentCommit, otherCommit)) {
logger.debug('Already merged');
log.debug('Already merged');
return;
}
if (isfastforwardable(currentCommit, otherCommit)) {
@@ -108,29 +108,29 @@ export const merge = function(otherBranch) {
commits[commit.id] = commit;
branches[curBranch] = commit.id;
}
logger.debug(branches);
logger.debug('in mergeBranch');
log.debug(branches);
log.debug('in mergeBranch');
};
export const checkout = function(branch) {
logger.debug('in checkout');
log.debug('in checkout');
curBranch = branch;
const id = branches[curBranch];
head = commits[id];
};
export const reset = function(commitRef) {
logger.debug('in reset', commitRef);
log.debug('in reset', commitRef);
const ref = commitRef.split(':')[0];
let parentCount = parseInt(commitRef.split(':')[1]);
let commit = ref === 'HEAD' ? head : commits[branches[ref]];
logger.debug(commit, parentCount);
log.debug(commit, parentCount);
while (parentCount > 0) {
commit = commits[commit.parent];
parentCount--;
if (!commit) {
const err = 'Critical error - unique parent commit not found during reset';
logger.error(err);
log.error(err);
throw err;
}
}
@@ -164,7 +164,7 @@ function prettyPrintCommitHistory(commitArr) {
for (let branch in branches) {
if (branches[branch] === commit.id) label.push(branch);
}
logger.debug(label.join(' '));
log.debug(label.join(' '));
if (Array.isArray(commit.parent)) {
const newCommit = commits[commit.parent[0]];
upsert(commitArr, commit, newCommit);
@@ -180,7 +180,7 @@ function prettyPrintCommitHistory(commitArr) {
}
export const prettyPrint = function() {
logger.debug(commits);
log.debug(commits);
const node = getCommitsArray()[0];
prettyPrintCommitHistory([node]);
};
@@ -212,7 +212,7 @@ export const getCommitsArray = function() {
return commits[key];
});
commitArr.forEach(function(o) {
logger.debug(o.id);
log.debug(o.id);
});
commitArr.sort((a, b) => b.seq - a.seq);
return commitArr;

18
src/diagrams/git/gitGraphRenderer.js
View File

@@ -2,7 +2,7 @@ import { curveBasis, line, select } from 'd3';
import db from './gitGraphAst';
import gitGraphParser from './parser/gitGraph';
import { logger } from '../../logger';
import { log } from '../../logger';
import { interpolateToCurve } from '../../utils';
let allCommitsDict = {};
@@ -87,7 +87,7 @@ function getElementCoords(element, coords) {
}
function svgDrawLineForCommits(svg, fromId, toId, direction, color) {
logger.debug('svgDrawLineForCommits: ', fromId, toId);
log.debug('svgDrawLineForCommits: ', fromId, toId);
const fromBbox = getElementCoords(svg.select('#node-' + fromId + ' circle'));
const toBbox = getElementCoords(svg.select('#node-' + toId + ' circle'));
switch (direction) {
@@ -203,7 +203,7 @@ function renderCommitHistory(svg, commitid, branches, direction) {
if (typeof commitid === 'string') {
do {
commit = allCommitsDict[commitid];
logger.debug('in renderCommitHistory', commit.id, commit.seq);
log.debug('in renderCommitHistory', commit.id, commit.seq);
if (svg.select('#node-' + commitid).size() > 0) {
return;
}
@@ -247,7 +247,7 @@ function renderCommitHistory(svg, commitid, branches, direction) {
}
}
if (branch) {
logger.debug('found branch ', branch.name);
log.debug('found branch ', branch.name);
svg
.select('#node-' + commit.id + ' p')
.append('xhtml:span')
@@ -271,7 +271,7 @@ function renderCommitHistory(svg, commitid, branches, direction) {
}
if (Array.isArray(commitid)) {
logger.debug('found merge commmit', commitid);
log.debug('found merge commmit', commitid);
renderCommitHistory(svg, commitid[0], branches, direction);
branchNum++;
renderCommitHistory(svg, commitid[1], branches, direction);
@@ -302,12 +302,12 @@ export const draw = function(txt, id, ver) {
parser.yy = db;
parser.yy.clear();
logger.debug('in gitgraph renderer', txt + '\n', 'id:', id, ver);
log.debug('in gitgraph renderer', txt + '\n', 'id:', id, ver);
// Parse the graph definition
parser.parse(txt + '\n');
config = Object.assign(config, apiConfig, db.getOptions());
logger.debug('effective options', config);
log.debug('effective options', config);
const direction = db.getDirection();
allCommitsDict = db.getCommits();
const branches = db.getBranchesAsObjArray();
@@ -330,8 +330,8 @@ export const draw = function(txt, id, ver) {
return (branches.length + 1) * config.branchOffset;
});
} catch (e) {
logger.error('Error while rendering gitgraph');
logger.error(e.message);
log.error('Error while rendering gitgraph');
log.error(e.message);
}
};