[Commands] Remove hidden --ignore-dependencies.

 - This was just for my own performance testing purposes, but we can now
   accomplish the same thing more directly with unit tests.

Author: ddunbar

Sources/Commands/SwiftBuildTool.swift

@@ -59,7 +59,6 @@ private enum BuildToolFlag: Argument {
     case buildTests
     case chdir(AbsolutePath)
     case colorMode(ColorWrap.Mode)
-    case ignoreDependencies
     case verbose(Int)
 
     init?(argument: String, pop: @escaping () -> String?) throws {
@@ -89,8 +88,6 @@ private enum BuildToolFlag: Argument {
                 throw OptionParserError.invalidUsage("invalid color mode: \(rawValue)")
             }
             self = .colorMode(mode)
-        case "--ignore-dependencies":
-            self = .ignoreDependencies
         default:
             return nil
         }
@@ -102,7 +99,6 @@ private class BuildToolOptions: Options {
     var flags = BuildFlags()
     var buildTests: Bool = false
     var colorMode: ColorWrap.Mode = .Auto
-    var ignoreDependencies: Bool = false
 }
 
 /// swift-build tool namespace
@@ -132,7 +128,7 @@ public struct SwiftBuildTool: SwiftTool {
                 print(Versioning.currentVersion.completeDisplayString)
 
             case .build(let conf, let toolchain):
-                let graph = try loadPackage(at: opts.path.root, ignoreDependencies: opts.ignoreDependencies)
+                let graph = try loadPackage(at: opts.path.root)
                 let yaml = try describe(opts.path.build, conf, graph, flags: opts.flags, toolchain: toolchain)
                 try build(yamlPath: yaml, target: opts.buildTests ? "test" : nil)
 
@@ -198,8 +194,6 @@ public struct SwiftBuildTool: SwiftTool {
                 opts.buildTests = true
             case .colorMode(let mode):
                 opts.colorMode = mode
-            case .ignoreDependencies:
-                opts.ignoreDependencies = true
             }
         }
 

Sources/Commands/SwiftPackageTool.swift

@@ -84,7 +84,6 @@ private enum PackageToolFlag: Argument {
     case xld(String)
     case xswiftc(String)
     case xcconfigOverrides(AbsolutePath)
-    case ignoreDependencies
     case verbose(Int)
 
     init?(argument: String, pop: @escaping () -> String?) throws {
@@ -115,8 +114,6 @@ private enum PackageToolFlag: Argument {
                 throw OptionParserError.invalidUsage("invalid color mode: \(rawValue)")
             }
             self = .colorMode(mode)
-        case "--ignore-dependencies":
-            self = .ignoreDependencies
         case "-Xcc":
             self = try .xcc(forcePop())
         case "-Xlinker":
@@ -139,7 +136,6 @@ class PackageToolOptions: Options {
     var verbosity: Int = 0
     var colorMode: ColorWrap.Mode = .Auto
     var xcodeprojOptions = XcodeprojOptions()
-    var ignoreDependencies: Bool = false
 }
 
 /// swift-build tool namespace
@@ -205,13 +201,13 @@ public struct SwiftPackageTool: SwiftTool {
                 fallthrough
 
             case .fetch:
-                _ = try loadPackage(at: opts.path.root, ignoreDependencies: opts.ignoreDependencies)
+                _ = try loadPackage(at: opts.path.root)
 
             case .showDependencies:
-                let graph = try loadPackage(at: opts.path.root, ignoreDependencies: opts.ignoreDependencies)
+                let graph = try loadPackage(at: opts.path.root)
                 dumpDependenciesOf(rootPackage: graph.rootPackage, mode: opts.showDepsMode)
             case .generateXcodeproj:
-                let graph = try loadPackage(at: opts.path.root, ignoreDependencies: opts.ignoreDependencies)
+                let graph = try loadPackage(at: opts.path.root)
 
                 let projectName: String
                 let dstdir: AbsolutePath
@@ -308,8 +304,6 @@ public struct SwiftPackageTool: SwiftTool {
                 opts.colorMode = mode
             case .xcconfigOverrides(let path):
                 opts.xcodeprojOptions.xcconfigOverrides = path
-            case .ignoreDependencies:
-                opts.ignoreDependencies = true
             }
         }
         if let mode = mode {

Sources/Commands/SwiftTestTool.swift

@@ -84,7 +84,6 @@ private enum TestToolFlag: Argument {
     case buildPath(AbsolutePath)
     case colorMode(ColorWrap.Mode)
     case skipBuild
-    case ignoreDependencies
     case verbose(Int)
 
     init?(argument: String, pop: @escaping () -> String?) throws {
@@ -114,8 +113,6 @@ private enum TestToolFlag: Argument {
                 throw OptionParserError.invalidUsage("invalid color mode: \(rawValue)")
             }
             self = .colorMode(mode)
-        case "--ignore-dependencies":
-            self = .ignoreDependencies
         default:
             return nil
         }
@@ -127,7 +124,6 @@ private class TestToolOptions: Options {
     var buildTests: Bool = true
     var colorMode: ColorWrap.Mode = .Auto
     var flags = BuildFlags()
-    var ignoreDependencies: Bool = false
 }
 
 /// swift-test tool namespace
@@ -185,7 +181,7 @@ public struct SwiftTestTool: SwiftTool {
     ///
     /// - Returns: The path to the test binary.
     private func buildTestsIfNeeded(_ opts: TestToolOptions) throws -> AbsolutePath {
-        let graph = try loadPackage(at: opts.path.root, ignoreDependencies: opts.ignoreDependencies)
+        let graph = try loadPackage(at: opts.path.root)
         if opts.buildTests {
             let yaml = try describe(opts.path.build, configuration, graph, flags: opts.flags, toolchain: UserToolchain())
             try build(yamlPath: yaml, target: "test")
@@ -259,8 +255,6 @@ public struct SwiftTestTool: SwiftTool {
                 opts.colorMode = mode
             case .skipBuild:
                 opts.buildTests = false
-            case .ignoreDependencies:
-                opts.ignoreDependencies = true
             }
         }
 

Sources/Commands/SwiftTool.swift

@@ -34,7 +34,7 @@ public extension SwiftTool {
     }
 
     /// Fetch and load the complete package at the given path.
-    func loadPackage(at path: AbsolutePath, ignoreDependencies: Bool) throws -> PackageGraph {
-        return try packageGraphLoader.loadPackage(at: path, ignoreDependencies: ignoreDependencies)
+    func loadPackage(at path: AbsolutePath) throws -> PackageGraph {
+        return try packageGraphLoader.loadPackage(at: path)
     }
 }

Sources/Get/PackagesDirectory.swift

@@ -61,16 +61,11 @@ public final class PackagesDirectory {
 
     /// Recursively fetch the dependencies for the root package.
     ///
-    /// - Parameters:
-    ///   - ignoreDependencies: If true, then skip resolution (and loading) of the package dependencies.
     /// - Returns: The loaded root package and all external packages, with dependencies resolved.
     /// - Throws: Error.InvalidDependencyGraph
-    public func loadManifests(ignoreDependencies: Bool = false) throws -> (rootManifest: Manifest, externalManifests: [Manifest]) {
+    public func loadManifests() throws -> (rootManifest: Manifest, externalManifests: [Manifest]) {
         // Load the manifest for the root package.
         let manifest = try manifestLoader.load(packagePath: rootPath, baseURL: rootPath.asString, version: nil)
-        if ignoreDependencies {
-            return (manifest, [])
-        }
 
         // Resolve and fetch all package dependencies and their manifests.
         let externalManifests = try recursivelyFetch(manifest.dependencies)

Sources/PackageGraph/PackageGraphLoader.swift

@@ -55,15 +55,12 @@ public struct PackageGraphLoader {
     }
 
     /// Load the package graph for the given package path.
-    ///
-    /// - Parameters:
-    ///   - ignoreDependencies: If true, then skip resolution (and loading) of the package dependencies.
-    public func loadPackage(at path: AbsolutePath, ignoreDependencies: Bool) throws -> PackageGraph {
+    public func loadPackage(at path: AbsolutePath) throws -> PackageGraph {
         // Create the packages directory container.
         let packagesDirectory = PackagesDirectory(root: path, manifestLoader: manifestLoader)
 
         // Fetch and load the manifests.
-        let (rootManifest, externalManifests) = try packagesDirectory.loadManifests(ignoreDependencies: ignoreDependencies)
+        let (rootManifest, externalManifests) = try packagesDirectory.loadManifests()
         let allManifests = externalManifests + [rootManifest]
 
         // Create the packages and convert to modules.