feat(prompts): retrieve common branch from svn repositories

Blarc · Blarc · commit 2f03a164f48f · 2025-04-24T20:04:38.000+02:00
Show branch notification only if branch variable is used.
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitsUtils.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitsUtils.kt
@@ -13,11 +13,16 @@ import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder
 import com.intellij.openapi.diff.impl.patch.UnifiedDiffWriter
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.changes.Change
+import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.tasks.TaskManager
 import com.intellij.util.text.DateFormatUtil
+import com.intellij.vcsUtil.VcsUtil
+import git4idea.GitVcs
 import git4idea.repo.GitRepositoryManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.jetbrains.idea.svn.SvnUtil
+import org.jetbrains.idea.svn.SvnVcs
 import java.io.StringWriter
 import java.nio.file.FileSystems
 import java.util.*
@@ -39,11 +44,11 @@ object AICommitsUtils {
         return false
     }
 
-    fun constructPrompt(promptContent: String, diff: String, branch: String, hint: String?, project: Project): String {
+    fun constructPrompt(promptContent: String, diff: String, branch: String?, hint: String?, project: Project): String {
         var content = promptContent
         val locale = project.service<ProjectSettings>().locale
         content = content.replace("{locale}", locale.getDisplayLanguage(Locale.ENGLISH))
-        content = content.replace("{branch}", branch)
+        content = replaceBranch(content, branch)
         content = replaceHint(content, hint)
 
         // TODO @Blarc: If TaskManager is null, the prompt might be incorrect...
@@ -62,6 +67,18 @@ object AICommitsUtils {
         }
     }
 
+    fun replaceBranch(promptContent: String, branch: String?): String {
+        if (promptContent.contains("{branch}")) {
+            if (branch != null) {
+                return promptContent.replace("{branch}", branch)
+            } else {
+                sendNotification(Notification.noCommonBranch())
+                return promptContent.replace("{branch}", "main")
+            }
+        }
+        return promptContent
+    }
+
     fun replaceHint(promptContent: String, hint: String?): String {
         val hintRegex = Regex("\\{[^{}]*(\\\$hint)[^{}]*}")
 
@@ -78,25 +95,29 @@ object AICommitsUtils {
         return promptContent.replace("{hint}", hint.orEmpty())
     }
 
-    suspend fun getCommonBranchOrDefault(changes: List<Change>, project: Project, showNotification: Boolean = true): String {
-        var branch = getCommonBranch(changes, project)
-        if (branch == null) {
-            // Can't show notification in edit prompt dialog
-            if (showNotification) {
-                sendNotification(Notification.noCommonBranch())
-            }
-            // hardcoded fallback branch
-            branch = "main"
-        }
-        return branch
-    }
-
     suspend fun getCommonBranch(changes: List<Change>, project: Project): String? {
-        val repositoryManager = GitRepositoryManager.getInstance(project)
         return withContext(Dispatchers.IO) {
-            changes.map {
-                repositoryManager.getRepositoryForFile(it.virtualFile)?.currentBranchName
-            }.filterNotNull().groupingBy { it }.eachCount().maxByOrNull { it.value }?.key
+            changes.mapNotNull {
+                it.virtualFile?.let { virtualFile ->
+                    VcsUtil.getVcsFor(project, virtualFile)?.let { vcs ->
+                        when (vcs) {
+                            is SvnVcs -> {
+                                SvnUtil.getUrl(vcs, VfsUtilCore.virtualToIoFile(virtualFile))?.let { url ->
+                                    extractSvnBranchName(url.toDecodedString())
+                                }
+                            }
+                            is GitVcs -> {
+                                GitRepositoryManager.getInstance(project)
+                                    .getRepositoryForFile(it.virtualFile)
+                                    ?.currentBranchName
+                            }
+                            else -> {
+                                null
+                            }
+                        }
+                    }
+                }
+            }.groupingBy { it }.eachCount().maxByOrNull { it.value }?.key
         }
     }
 
@@ -140,22 +161,27 @@ object AICommitsUtils {
             .joinToString("\n")
     }
 
-    // TODO @Blarc: This only works for OpenAI
-//    fun isPromptTooLarge(prompt: String): Boolean {
-//        val registry = Encodings.newDefaultEncodingRegistry()
-//
-//        /*
-//         * Try to find the model type based on the model id by finding the longest matching model type
-//         * If no model type matches, let the request go through and let the OpenAI API handle it
-//         */
-//        val modelType = ModelType.entries
-//            .filter { AppSettings2.instance.getActiveLLMClient().modelId.contains(it.name) }
-//            .maxByOrNull { it.name.length }
-//            ?: return false
-//
-//        val encoding = registry.getEncoding(modelType.encodingType)
-//        return encoding.countTokens(prompt) > modelType.maxContextLength
-//    }
+    private fun extractSvnBranchName(url: String): String? {
+        val normalizedUrl = url.lowercase()
+
+        // Standard SVN layout: repository/trunk, repository/branches/name, repository/tags/name
+        return when {
+            normalizedUrl.contains("/branches/") -> {
+                val branchPart = url.substringAfter("/branches/")
+                val endIndex = branchPart.indexOf('/')
+                if (endIndex > 0) branchPart.substring(0, endIndex) else branchPart
+            }
+
+            normalizedUrl.contains("/tags/") -> {
+                val tagPart = url.substringAfter("/tags/")
+                val endIndex = tagPart.indexOf('/')
+                if (endIndex > 0) "tag: ${tagPart.substring(0, endIndex)}" else "tag: $tagPart"
+            }
+
+            normalizedUrl.contains("/trunk") -> "trunk"
+            else -> null // fallback: no branch concept available
+        }
+    }
 
     suspend fun retrieveToken(title: String): OneTimeString? {
         val credentialAttributes = getCredentialAttributes(title)
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientService.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientService.kt
@@ -3,7 +3,7 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.computeDiff
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.constructPrompt
-import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCommonBranchOrDefault
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCommonBranch
 import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
 import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
@@ -96,7 +96,7 @@ abstract class LLMClientService<C : LLMClientConfiguration>(private val cs: Coro
                     return@withBackgroundProgress
                 }
 
-                val branch = getCommonBranchOrDefault(includedChanges, project)
+                val branch = getCommonBranch(includedChanges, project)
                 val prompt = constructPrompt(project.service<ProjectSettings>().activePrompt.content, diff, branch, commitMessage.text, project)
 
                 makeRequest(clientConfiguration, prompt, onSuccess = {
diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/prompts/PromptTable.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/prompts/PromptTable.kt
@@ -4,7 +4,7 @@ import ai.grazie.utils.applyIf
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.computeDiff
-import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCommonBranchOrDefault
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils.getCommonBranch
 import com.github.blarc.ai.commits.intellij.plugin.createColumn
 import com.github.blarc.ai.commits.intellij.plugin.notBlank
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
@@ -119,7 +119,7 @@ class PromptTable(private val cs: CoroutineScope) {
         val promptHintTextField = JBTextField()
         val promptContentTextArea = JBTextArea()
         val promptPreviewTextArea = JBTextArea()
-        lateinit var branch: String
+        var branch: String? = null
         lateinit var diff: String
         lateinit var project: Project
         private val logger = Logger.getInstance(PromptDialog::class.java)
@@ -233,7 +233,7 @@ class PromptTable(private val cs: CoroutineScope) {
                 logger.warn("No changes found for the current branch.")
             }
 
-            branch = getCommonBranchOrDefault(changes, project, false)
+            branch = getCommonBranch(changes, project)
             diff = computeDiff(changes, true, project)
 
             withContext(Dispatchers.EDT) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -59,6 +59,7 @@
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
     <depends>Git4Idea</depends>
+    <depends>Subversion</depends>
 
     <applicationListeners>
 
