marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-14 09:44:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2954 from husa/feature/2936-gitgraph-pathed-branch-name

Browse Source 
GitGraph: add support for "pathed" branches. fix #2936
This commit is contained in:
Ashish Jain
2022-04-21 20:11:39 +02:00
committed by GitHub
parent 1947af0693 99a8c0d152
commit a3e6d3cd76
2 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/diagrams/git/gitGraphParserV2.spec.js
View File

@@ -336,6 +336,20 @@ describe('when parsing a gitGraph', function () {
expect(Object.keys(parser.yy.getBranches()).length).toBe(2);
});
it('should allow _-./ characters in branch names', function () {
const str = `gitGraph:
commit
branch azAZ_-./test
`;
parser.parse(str);
const commits = parser.yy.getCommits();
expect(Object.keys(commits).length).toBe(1);
expect(parser.yy.getCurrentBranch()).toBe('azAZ_-./test');
expect(parser.yy.getDirection()).toBe('LR');
expect(Object.keys(parser.yy.getBranches()).length).toBe(2);
});
it('should handle new branch checkout', function () {
const str = `gitGraph:
commit

2
src/diagrams/git/parser/gitGraph.jison
View File

@@ -49,7 +49,7 @@
["] this.begin("string");
<string>["] this.popState();
<string>[^"]* return 'STR';
[a-zA-Z][-_\.a-zA-Z0-9]*[-_a-zA-Z0-9] return 'ID';
[a-zA-Z][-_\./a-zA-Z0-9]*[-_a-zA-Z0-9] return 'ID';
<<EOF>> return 'EOF';
/lex