Do not emit errors about the resolved file being out-of-date if cloning already fails (#5916)

The additional bogus error muddles the water on what the underlying error was, so we should simply not emit it.

rdar://84000597

Author: neonichu

Sources/Workspace/Workspace.swift

@@ -45,6 +45,9 @@ public enum WorkspaceResolveReason: Equatable {
 
     /// An unknown reason.
     case other(String)
+
+    /// Errors previously reported, e.g. during cloning. This will skip emitting additional unhelpful diagnostics.
+    case errorsPreviouslyReported
 }
 
 public struct PackageFetchDetails {
@@ -2302,7 +2305,7 @@ extension Workspace {
             observabilityScope: observabilityScope
         )
 
-        if case let .required(reason) = precomputationResult {
+        if case let .required(reason) = precomputationResult, reason != .errorsPreviouslyReported {
             let reasonString = Self.format(workspaceResolveReason: reason)
 
             if !fileSystem.exists(self.location.resolvedVersionsFile) {
@@ -2607,6 +2610,10 @@ extension Workspace {
         let resolver = PubgrubDependencyResolver(provider: precomputationProvider, pinsMap: pinsStore.pinsMap, observabilityScope: observabilityScope)
         let result = resolver.solve(constraints: computedConstraints)
 
+        guard !observabilityScope.errorsReported else {
+            return .required(reason: .errorsPreviouslyReported)
+        }
+
         switch result {
         case .success:
             return .notRequired
@@ -3368,6 +3375,10 @@ fileprivate extension PackageDependency {
 
 extension Workspace {
     public static func format(workspaceResolveReason reason: WorkspaceResolveReason) -> String {
+        guard reason != .errorsPreviouslyReported else {
+            return ""
+        }
+
         var result = "Running resolver because "
 
         switch reason {
@@ -3415,7 +3426,7 @@ extension Workspace {
 
             result.append(" requirement.")
         default:
-            result.append(" requirements have changed.")
+            result.append("requirements have changed.")
         }
 
         return result

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -4107,7 +4107,7 @@ final class WorkspaceTests: XCTestCase {
         // Check force resolve. This should produce an error because the resolved file is out-of-date.
         workspace.checkPackageGraphFailure(roots: ["Root"], forceResolvedVersions: true) { diagnostics in
             testDiagnostics(diagnostics) { result in
-                result.check(diagnostic: "an out-of-date resolved file was detected at \(sandbox.appending(components: "Package.resolved")), which is not allowed when automatic dependency resolution is disabled; please make sure to update the file to reflect the changes in dependencies. Running resolver because  requirements have changed.", severity: .error)
+                result.check(diagnostic: "an out-of-date resolved file was detected at \(sandbox.appending(components: "Package.resolved")), which is not allowed when automatic dependency resolution is disabled; please make sure to update the file to reflect the changes in dependencies. Running resolver because requirements have changed.", severity: .error)
             }
         }
         workspace.checkManagedDependencies { result in