GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

fixed cherrypicking tests

Browse Source
This commit is contained in:
Austin Fulbright 2024-07-24 10:37:21 -04:00
parent d2e2017907
commit 0b67cffdfa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/mermaid/src/diagrams/git/gitGraphAst.ts
View File

@ -139,7 +139,7 @@ export const branch = function (name: string, order: number | undefined) {
log.debug('in createBranch'); log.debug('in createBranch');
} else { } else {
throw new Error( throw new Error(
`Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${name}" to switch to an existing branch)` `Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${name}")`
); );
} }
}; };
@ -306,16 +306,17 @@ export const cherryPick = function (
} }
const sourceCommit = commits.get(sourceId); const sourceCommit = commits.get(sourceId);
if (sourceCommit === undefined || !sourceCommit) {
throw new Error('Incorrect usage of "cherryPick". Source commit id should exist and provided');
}
if ( if (
!sourceCommit || parentCommitId &&
!parentCommitId || !(Array.isArray(sourceCommit.parents) && sourceCommit.parents.includes(parentCommitId))
!Array.isArray(sourceCommit.parents) ||
!sourceCommit.parents.includes(parentCommitId)
) { ) {
throw new Error( const error = new Error(
'Invalid operation: The specified parent commit is not an immediate parent of the cherry-picked commit.' 'Invalid operation: The specified parent commit is not an immediate parent of the cherry-picked commit.'
); );
throw error;
} }
const sourceCommitBranch = sourceCommit.branch; const sourceCommitBranch = sourceCommit.branch;
if (sourceCommit.type === commitType.MERGE && !parentCommitId) { if (sourceCommit.type === commitType.MERGE && !parentCommitId) {