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

GitGraph: simplified overlapping check fn

Browse Source
This commit is contained in:
Guy Pursey
2023-10-13 09:29:43 +01:00
parent 902a9dd42b
commit dba7197fc6
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/mermaid/src/diagrams/git/gitGraphRenderer.js
View File

@@ -353,14 +353,10 @@ const drawCommits = (svg, commits, modifyGraph) => {
*/ */
const hasOverlappingCommits = (commitA, commitB, allCommits) => { const hasOverlappingCommits = (commitA, commitB, allCommits) => {
const isOnSourceBranch = (x) => x.branch === commitA.branch; const isOnSourceBranch = (x) => x.branch === commitA.branch;
const isOnTargetBranch = (x) => x.branch === commitB.branch;
const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq; const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq;
const isTargetMain = (x) => x.branch === getConfig().gitGraph.mainBranchName; const sourceIsMain = commitA.branch === getConfig().gitGraph.mainBranchName;
return Object.values(allCommits).some((commitX) => { return Object.values(allCommits).some((commitX) => {
return ( return isBetweenCommits(commitX) && (sourceIsMain || isOnSourceBranch(commitX));
(isOnSourceBranch(commitX) || (isOnTargetBranch(commitX) && !isTargetMain(commitX))) &&
isBetweenCommits(commitX)
);
}); });
}; };