Consolidate dependency path determination into dedicated APIs

Author: mattt

Sources/Workspace/Workspace.swift

@@ -1112,7 +1112,7 @@ extension Workspace {
 
         // Remove the existing checkout.
         do {
-            let oldCheckoutPath = self.location.repositoriesCheckoutsDirectory.appending(dependency.subpath)
+            let oldCheckoutPath = self.location.repositoriesCheckoutSubdirectory(for: dependency.packageRef)
             try fileSystem.chmod(.userWritable, path: oldCheckoutPath, options: [.recursive, .onlyFiles])
             try fileSystem.removeFileTree(oldCheckoutPath)
         }
@@ -1150,7 +1150,7 @@ extension Workspace {
         }
 
         // Form the edit working repo path.
-        let path = self.location.editsDirectory.appending(dependency.subpath)
+        let path = self.location.editsSubdirectory(for: dependency.packageRef)
         // Check for uncommited and unpushed changes if force removal is off.
         if !forceRemove {
             let workingCopy = try repositoryManager.openWorkingCopy(at: path)
@@ -1440,9 +1440,9 @@ extension Workspace {
     public func path(to dependency: Workspace.ManagedDependency) -> AbsolutePath {
         switch dependency.state {
         case .checkout:
-            return self.location.repositoriesCheckoutsDirectory.appending(dependency.subpath)
+            return self.location.repositoriesCheckoutSubdirectory(for: dependency.packageRef)
         case .edited(_, let path):
-            return path ?? self.location.editsDirectory.appending(dependency.subpath)
+            return path ?? self.location.editsSubdirectory(for: dependency.packageRef)
         case .local:
             return AbsolutePath(dependency.packageRef.location)
         }
@@ -2676,7 +2676,7 @@ extension Workspace {
         // If we already have it, fetch to update the repo from its remote.
         // also compare the location as it may have changed
         if let dependency = self.state.dependencies[comparingLocation: package] {
-            let path = self.location.repositoriesCheckoutsDirectory.appending(dependency.subpath)
+            let path = self.location.repositoriesCheckoutSubdirectory(for: dependency.packageRef)
 
             // Make sure the directory is not missing (we will have to clone again
             // if not).
@@ -2844,7 +2844,7 @@ extension Workspace {
         }
 
         // Remove the checkout.
-        let dependencyPath = self.location.repositoriesCheckoutsDirectory.appending(dependencyToRemove.subpath)
+        let dependencyPath = self.location.repositoriesCheckoutSubdirectory(for: dependencyToRemove.packageRef)
         let workingCopy = try repositoryManager.openWorkingCopy(at: dependencyPath)
         guard !workingCopy.hasUncommittedChanges() else {
             throw WorkspaceDiagnostics.UncommitedChanges(repositoryPath: dependencyPath)

Sources/Workspace/WorkspaceConfiguration.swift

@@ -42,11 +42,21 @@ extension Workspace {
             self.workingDirectory.appending(component: "repositories")
         }
 
+        /// Returns the path to the repository checkout directory for a package.
+        public func editsSubdirectory(for package: PackageReference) -> AbsolutePath {
+            self.editsDirectory.appending(subpath(for: package))
+        }
+
         /// Path to the repository checkouts.
         public var repositoriesCheckoutsDirectory: AbsolutePath {
             self.workingDirectory.appending(component: "checkouts")
         }
 
+        /// Returns the path to the repository checkout directory for a package.
+        public func repositoriesCheckoutSubdirectory(for package: PackageReference) -> AbsolutePath {
+            self.repositoriesCheckoutsDirectory.appending(subpath(for: package))
+        }
+
         /// Path to the downloaded binary artifacts.
         public var artifactsDirectory: AbsolutePath {
             self.workingDirectory.appending(component: "artifacts")
@@ -72,6 +82,10 @@ extension Workspace {
             self.sharedConfigurationDirectory.map { DefaultLocations.registriesConfigurationFile(at: $0) }
         }
 
+        private func subpath(for package: PackageReference) -> RelativePath {
+            return RelativePath(package.identity.description.lowercased())
+        }
+
         /// Create a new workspace location.
         ///
         /// - Parameters: