fix regex and add branch from env var option

Andrija Pantovic · Andrija Pantovic · commit 82ff85f3063c · 2021-04-23T12:17:26.000+02:00
diff --git a/src/main/kotlin/io/wusa/GitService.kt b/src/main/kotlin/io/wusa/GitService.kt
@@ -102,8 +102,12 @@ class GitService {
         }
 
         private fun getCurrentBranch(project: Project): String {
-            val head = GitCommandRunner.execute(project.projectDir, arrayOf("log", "-n", "1", "--pretty=%d", "HEAD"))
-            return """\([grafted, ]{0,9}HEAD -> (.*?)[,|)]|\([grafted, ]{0,9}HEAD,.*origin\/(.*?)[,|)]""".toRegex().find(head)!!.groupValues[1]
+            var branchName: String? = System.getenv("BRANCH_NAME")
+            if (branchName == null) {
+                val head = GitCommandRunner.execute(project.projectDir, arrayOf("log", "-n", "1", "--pretty=%d", "HEAD"))
+                branchName = """\([grafted, ]{0,9}HEAD(?: -> |,)(?:(\S+),|\)|.*,(?: origin\/| )(\S+)\))""".toRegex().find(head)!!.groupValues.filter { it != "" }[1]
+            }
+            return branchName
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,12 @@ class GitService {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`private fun getCurrentBranch(project: Project): String {`
`105`		`- val head = GitCommandRunner.execute(project.projectDir, arrayOf("log", "-n", "1", "--pretty=%d", "HEAD"))`
`106`		`- return """\([grafted, ]{0,9}HEAD -> (.?)[,\|)]\|\([grafted, ]{0,9}HEAD,.origin\/(.*?)[,\|)]""".toRegex().find(head)!!.groupValues[1]`
	`105`	`+ var branchName: String? = System.getenv("BRANCH_NAME")`
	`106`	`+ if (branchName == null) {`
	`107`	`+ val head = GitCommandRunner.execute(project.projectDir, arrayOf("log", "-n", "1", "--pretty=%d", "HEAD"))`
	`108`	`+ branchName = """\([grafted, ]{0,9}HEAD(?: -> \|,)(?:(\S+),\|\)\|.*,(?: origin\/\| )(\S+)\))""".toRegex().find(head)!!.groupValues.filter { it != "" }[1]`
	`109`	`+ }`
	`110`	`+ return branchName`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`	`}`