VCS: Support URLs ending with ".git" in splitUrl()

Add handling of URLs ending with ".git" to the `splitUrl()` function. Previously, the `VcsType` of such URLs could not be detected. Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@here.com>
oss-review-toolkit · Sep 3, 2019 · a3d9450 · a3d9450
1 parent 9fded2a
commit a3d9450
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/downloader/src/main/kotlin/VersionControlSystem.kt b/downloader/src/main/kotlin/VersionControlSystem.kt
@@ -222,6 +222,10 @@ abstract class VersionControlSystem {
 
                 else -> {
                     when {
+                        vcsUrl.endsWith(".git") -> {
+                            VcsInfo(VcsType.GIT, normalizeVcsUrl(vcsUrl), "", null, "")
+                        }
+
                         vcsUrl.contains(".git/") -> {
                             val url = normalizeVcsUrl(vcsUrl.substringBefore(".git/"))
                             val path = vcsUrl.substringAfter(".git/")

diff --git a/downloader/src/test/kotlin/VersionControlSystemTest.kt b/downloader/src/test/kotlin/VersionControlSystemTest.kt
@@ -66,6 +66,19 @@ class VersionControlSystemTest : WordSpec({
 
     "splitUrl" should {
         "split paths from a URL to a Git repository" {
+            val actual = VersionControlSystem.splitUrl(
+                "https://git-wip-us.apache.org/repos/asf/zeppelin.git"
+            )
+            val expected = VcsInfo(
+                type = VcsType.GIT,
+                url = "https://git-wip-us.apache.org/repos/asf/zeppelin.git",
+                revision = "",
+                path = ""
+            )
+            actual shouldBe expected
+        }
+
+        "split paths from a URL to a Git repository with path" {
             val actual = VersionControlSystem.splitUrl(
                 "https://git-wip-us.apache.org/repos/asf/zeppelin.git/zeppelin-interpreter"
             )