fixup

Author: tomerd

Sources/Basics/SourceControlURL.swift

@@ -13,21 +13,17 @@
 import Foundation
 
 public struct SourceControlURL: Codable, Equatable, Hashable, Sendable {
-    private let underlying: URL?
     private let urlString: String
 
     public init(stringLiteral: String) {
-        self.underlying = URL(string: stringLiteral)
         self.urlString = stringLiteral
     }
 
     public init(_ urlString: String) {
-        self.underlying = URL(string: urlString)
         self.urlString = urlString
     }
 
     public init(_ url: URL) {
-        self.underlying = url
         self.urlString = url.absoluteString
     }
 
@@ -40,11 +36,7 @@ public struct SourceControlURL: Codable, Equatable, Hashable, Sendable {
     }
 
     public var url: URL? {
-        return self.underlying
-    }
-
-    public var scheme: String? {
-        return self.underlying?.scheme
+        return URL(string: self.urlString)
     }
 }
 

Sources/PackageModel/PackageIdentity.swift

@@ -424,7 +424,7 @@ public struct CanonicalPackageLocation: Equatable, CustomStringConvertible {
 }
 
 /// Similar to `CanonicalPackageLocation` but differentiates based on the scheme.
-public struct CanonicalPackageURL: CustomStringConvertible {
+public struct CanonicalPackageURL: Equatable, CustomStringConvertible {
     public let description: String
     public let scheme: String?
 

Sources/PackageModel/PackageReference.swift

@@ -169,11 +169,16 @@ extension PackageReference: Equatable {
         }
         switch (self.kind, other.kind) {
         case (.remoteSourceControl(let lurl), .remoteSourceControl(let rurl)):
-            return lurl.scheme == rurl.scheme
+            return lurl.canonicalURL == rurl.canonicalURL
         default:
-            break
+            return true
         }
-        return true
+    }
+}
+
+extension SourceControlURL {
+    var canonicalURL: CanonicalPackageURL {
+        CanonicalPackageURL(self.absoluteString)
     }
 }
 

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -11367,7 +11367,8 @@ final class WorkspaceTests: XCTestCase {
                     products: [
                         MockProduct(name: "FooProduct", targets: ["FooTarget"]),
                     ],
-                    versions: ["1.0.0"]
+                    versions: ["1.0.0"],
+                    revisionProvider: { _ in "foo" } // we need this to be consistent for fingerprints check to work
                 ),
                 MockPackage(
                     name: "FooPackage",
@@ -11378,7 +11379,8 @@ final class WorkspaceTests: XCTestCase {
                     products: [
                         MockProduct(name: "FooProduct", targets: ["FooTarget"]),
                     ],
-                    versions: ["1.0.0"]
+                    versions: ["1.0.0"],
+                    revisionProvider: { _ in "foo" } // we need this to be consistent for fingerprints check to work
                 ),
             ]
         )
@@ -11480,7 +11482,8 @@ final class WorkspaceTests: XCTestCase {
                     products: [
                         MockProduct(name: "FooProduct", targets: ["FooTarget"]),
                     ],
-                    versions: ["1.0.0"]
+                    versions: ["1.0.0"],
+                    revisionProvider: { _ in "foo" } // we need this to be consistent for fingerprints check to work
                 ),
                 MockPackage(
                     name: "BarPackage",
@@ -11510,7 +11513,8 @@ final class WorkspaceTests: XCTestCase {
                     products: [
                         MockProduct(name: "FooProduct", targets: ["FooTarget"]),
                     ],
-                    versions: ["1.0.0"]
+                    versions: ["1.0.0"],
+                    revisionProvider: { _ in "foo" } // we need this to be consistent for fingerprints check to work
                 ),
                 MockPackage(
                     name: "FooPackage",
@@ -11521,7 +11525,8 @@ final class WorkspaceTests: XCTestCase {
                     products: [
                         MockProduct(name: "FooProduct", targets: ["FooTarget"]),
                     ],
-                    versions: ["1.0.0"]
+                    versions: ["1.0.0"],
+                    revisionProvider: { _ in "foo" } // we need this to be consistent for fingerprints check to work
                 ),
             ]
         )