fix(swiftpm): Remove an invalid fallback for the VCS revision

Leave the `vcs.revision` blank if the revision is not available for consistency with other package managers. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Feb 7, 2024 · 250df58 · 250df58
1 parent ceb7e84
commit 250df58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...nagers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml b/...nagers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml
@@ -95,12 +95,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/apple/swift-llbuild.git"
-    revision: "9.0.8"
+    revision: ""
     path: ""
   vcs_processed:
     type: "Git"
     url: "https://github.com/apple/swift-llbuild.git"
-    revision: "9.0.8"
+    revision: ""
     path: ""
 - id: "Swift::github.com/braze-inc/braze-ios-sdk:branch-master"
   purl: "pkg:swift/github.com%2Fbraze-inc%2Fbraze-ios-sdk@branch-master"

diff --git a/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt b/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
@@ -194,10 +194,7 @@ private fun SwiftPackage.toId(pinsByIdentity: Map<String, PinV2>): Identifier =
     )
 
 private fun SwiftPackage.toVcsInfo(pinsByIdentity: Map<String, PinV2>): VcsInfo =
-    pinsByIdentity[identity]?.toVcsInfo() ?: run {
-        val vcsInfoFromUrl = VcsHost.parseUrl(url)
-        return vcsInfoFromUrl.takeUnless { it.revision.isBlank() } ?: vcsInfoFromUrl.copy(revision = version)
-    }
+    pinsByIdentity[identity]?.toVcsInfo() ?: VcsHost.parseUrl(url)
 
 private fun SwiftPackage.toPackage(pinsByIdentity: Map<String, PinV2>): Package =
     createPackage(toId(pinsByIdentity), toVcsInfo(pinsByIdentity))
@@ -241,7 +238,6 @@ private fun PinV2.toVcsInfo(): VcsInfo {
     return if (vcsInfoFromUrl.revision.isBlank() && state != null) {
         when {
             !state.revision.isNullOrBlank() -> vcsInfoFromUrl.copy(revision = state.revision)
-            !state.version.isNullOrBlank() -> vcsInfoFromUrl.copy(revision = state.version)
             else -> vcsInfoFromUrl
         }
     } else {