Subversion: Fix the remote URL to not contain a branch / tag name

This is a fixup for 103a3c1 and fixes #5232. Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io>
oss-review-toolkit · Sep 23, 2022 · 0cddfce · 0cddfce
1 parent b8b0463
commit 0cddfce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/downloader/src/funTest/kotlin/vcs/SubversionWorkingTreeFunTest.kt b/downloader/src/funTest/kotlin/vcs/SubversionWorkingTreeFunTest.kt
@@ -65,7 +65,7 @@ class SubversionWorkingTreeFunTest : StringSpec({
         workingTree.isValid() shouldBe true
         workingTree.getInfo() shouldBe VcsInfo(
             type = VcsType.SUBVERSION,
-            url = "https://svn.code.sf.net/p/docutils/code/trunk/docutils",
+            url = "https://svn.code.sf.net/p/docutils/code",
             revision = "8207",
             path = ""
         )

diff --git a/downloader/src/main/kotlin/vcs/Subversion.kt b/downloader/src/main/kotlin/vcs/Subversion.kt
@@ -141,9 +141,8 @@ class Subversion : VersionControlSystem() {
                 )
             } ?: run {
                 // This code path updates the working tree to a symbolic revision.
-                val svnUrl = SVNURL.parseURIEncoded(
-                    "${workingTree.getRemoteUrl()}/$revision"
-                )
+                val fullUrl = (workingTree as SubversionWorkingTree).getFullUrl()
+                val svnUrl = SVNURL.parseURIEncoded("$fullUrl/$revision")
 
                 // First switch the (empty) working tree to the requested branch / tag.
                 clientManager.updateClient.doSwitch(

diff --git a/downloader/src/main/kotlin/vcs/SubversionWorkingTree.kt b/downloader/src/main/kotlin/vcs/SubversionWorkingTree.kt
@@ -47,7 +47,7 @@ class SubversionWorkingTree(
 
     override fun isShallow() = false
 
-    override fun getRemoteUrl() = doSvnInfo()?.url?.toString().orEmpty()
+    override fun getRemoteUrl() = doSvnInfo()?.repositoryRootURL?.toString().orEmpty()
 
     override fun getRevision() = doSvnInfo()?.committedRevision?.number?.toString().orEmpty()
 
@@ -57,14 +57,17 @@ class SubversionWorkingTree(
 
     override fun listRemoteTags() = listRemoteRefs("tags")
 
+    fun getFullUrl() = doSvnInfo()?.url?.toString().orEmpty()
+
     private fun listRemoteRefs(namespace: String): List<String> {
         val refs = mutableListOf<String>()
         val remoteUrl = getRemoteUrl()
+        val fullUrl = getFullUrl()
 
-        val projectRoot = if (directoryNamespaces.any { "/$it/" in remoteUrl }) {
-            doSvnInfo()?.repositoryRootURL?.toString().orEmpty()
-        } else {
+        val projectRoot = if (directoryNamespaces.any { "/$it/" in fullUrl }) {
             remoteUrl
+        } else {
+            fullUrl
         }
 
         // We assume a single project directory layout.