Skip to content

Commit 9aef406

Browse files
tomerdtomerd
committed
rename "git" to "scm"
1 parent 281beb2 commit 9aef406

24 files changed

+121
-121
lines changed

‎Bar-1.2.3.zip

-476 Bytes
Binary file not shown.

‎Sources/Commands/Describe.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fileprivate struct DescribedPackage: Encodable {
112112
case .local(let data):
113113
self.url = data.path.pathString
114114
self.requirement = nil
115-
case .git(let data):
115+
case .scm(let data):
116116
self.url = data.location
117117
self.requirement = data.requirement
118118
}

‎Sources/PackageGraph/PackageGraph+Loading.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private func createResolvedPackages(
228228
switch dependency {
229229
case .local(let data):
230230
dependencyLocation = data.path.pathString
231-
case .git(let data):
231+
case .scm(let data):
232232
dependencyLocation = data.location
233233
}
234234

‎Sources/PackageGraph/PackageGraph.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ fileprivate extension PackageDependencyDescription {
236236
switch self {
237237
case .local(let data):
238238
parameters.append("path: \"\(data.path)\"")
239-
case .git(let data):
239+
case .scm(let data):
240240
parameters.append("url: \"\(data.location)\"")
241241
switch data.requirement {
242242
case .branch(let branch):

‎Sources/PackageGraph/PackageGraphRoot.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ extension PackageDependencyDescription {
8989
switch self {
9090
case .local:
9191
return .unversioned
92-
case .git(let data):
92+
case .scm(let data):
9393
return data.requirement.toConstraintRequirement()
9494
}
9595
}

‎Sources/PackageGraph/PackageModel+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension PackageDependencyDescription {
2121
case .local(let data):
2222
packageKind = .local
2323
location = data.path.pathString
24-
case .git(let data):
24+
case .scm(let data):
2525
packageKind = .remote
2626
location = data.location
2727
}

‎Sources/PackageLoading/PackageDescription4Loader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ extension PackageDependencyDescription {
372372
// in the future this will check with the registries for the identity of the URL
373373
let identity = identityResolver.resolveIdentity(for: location)
374374
let requirement = try Requirement(v4: requirementJSON)
375-
self = .git(identity: identity,
375+
self = .scm(identity: identity,
376376
name: name,
377377
location: location,
378378
requirement: requirement,

‎Sources/PackageModel/Manifest/PackageDependencyDescription.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public enum PackageDependencyDescription: Equatable {
2020
public let productFilter: ProductFilter
2121
}
2222

23-
public struct Git: Equatable, Codable {
23+
public struct SourceControlRepository: Equatable, Codable {
2424
public let identity: PackageIdentity
2525
public let name: String?
2626
public let location: String
@@ -29,7 +29,7 @@ public enum PackageDependencyDescription: Equatable {
2929
}
3030

3131
case local(Local)
32-
case git(Git)
32+
case scm(SourceControlRepository)
3333
//case registry(data: Registry) // for future
3434

3535
/// The dependency requirement.
@@ -52,7 +52,7 @@ public enum PackageDependencyDescription: Equatable {
5252
switch self {
5353
case .local(let data):
5454
return data.identity
55-
case .git(let data):
55+
case .scm(let data):
5656
return data.identity
5757
}
5858
}
@@ -63,7 +63,7 @@ public enum PackageDependencyDescription: Equatable {
6363
switch self {
6464
case .local(let data):
6565
return data.name ?? LegacyPackageIdentity.computeDefaultName(fromURL: data.path.pathString)
66-
case .git(let data):
66+
case .scm(let data):
6767
return data.name ?? LegacyPackageIdentity.computeDefaultName(fromURL: data.location)
6868
}
6969
}
@@ -74,7 +74,7 @@ public enum PackageDependencyDescription: Equatable {
7474
switch self {
7575
case .local(let data):
7676
return data.name
77-
case .git(let data):
77+
case .scm(let data):
7878
return data.name
7979
}
8080
}
@@ -83,7 +83,7 @@ public enum PackageDependencyDescription: Equatable {
8383
switch self {
8484
case .local(let data):
8585
return data.productFilter
86-
case .git(let data):
86+
case .scm(let data):
8787
return data.productFilter
8888
}
8989
}
@@ -92,7 +92,7 @@ public enum PackageDependencyDescription: Equatable {
9292
switch self {
9393
case .local:
9494
return true
95-
case .git:
95+
case .scm:
9696
return false
9797
}
9898
}
@@ -104,8 +104,8 @@ public enum PackageDependencyDescription: Equatable {
104104
name: data.name,
105105
path: data.path,
106106
productFilter: productFilter)
107-
case .git(let data):
108-
return .git(identity: data.identity,
107+
case .scm(let data):
108+
return .scm(identity: data.identity,
109109
name: data.name,
110110
location: data.location,
111111
requirement: data.requirement,
@@ -126,13 +126,13 @@ public enum PackageDependencyDescription: Equatable {
126126
)
127127
}
128128

129-
public static func git(identity: PackageIdentity,
129+
public static func scm(identity: PackageIdentity,
130130
name: String?,
131131
location: String,
132132
requirement: Requirement,
133133
productFilter: ProductFilter
134134
) -> PackageDependencyDescription {
135-
.git (
135+
.scm (
136136
.init(identity: identity,
137137
name: name,
138138
location: location,
@@ -147,7 +147,7 @@ extension PackageDependencyDescription: CustomStringConvertible {
147147
switch self {
148148
case .local(let data):
149149
return "local[\(data)]"
150-
case .git(let data):
150+
case .scm(let data):
151151
return "git[\(data)]"
152152
}
153153
}
@@ -170,7 +170,7 @@ extension PackageDependencyDescription.Requirement: CustomStringConvertible {
170170

171171
extension PackageDependencyDescription: Codable {
172172
private enum CodingKeys: String, CodingKey {
173-
case local, git
173+
case local, scm
174174
}
175175

176176
public func encode(to encoder: Encoder) throws {
@@ -179,8 +179,8 @@ extension PackageDependencyDescription: Codable {
179179
case .local(let data):
180180
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .local)
181181
try unkeyedContainer.encode(data)
182-
case .git(let data):
183-
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .git)
182+
case .scm(let data):
183+
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .scm)
184184
try unkeyedContainer.encode(data)
185185

186186
}
@@ -196,10 +196,10 @@ extension PackageDependencyDescription: Codable {
196196
var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
197197
let data = try unkeyedValues.decode(Local.self)
198198
self = .local(data)
199-
case .git:
199+
case .scm:
200200
var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
201-
let data = try unkeyedValues.decode(Git.self)
202-
self = .git(data)
201+
let data = try unkeyedValues.decode(SourceControlRepository.self)
202+
self = .scm(data)
203203
}
204204
}
205205
}

‎Sources/PackageModel/ManifestSourceGeneration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fileprivate extension SourceCodeFragment {
123123
switch dependency {
124124
case .local(let data):
125125
params.append(SourceCodeFragment(key: "path", string: data.path.pathString))
126-
case .git(let data):
126+
case .scm(let data):
127127
params.append(SourceCodeFragment(key: "url", string: data.location))
128128
switch data.requirement {
129129
case .exact(let version):

‎Sources/SPMTestSupport/MockDependency.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public struct MockDependency {
4040
let location = identityResolver.resolveLocation(from: path.pathString)
4141
let identity = identityResolver.resolveIdentity(for: location)
4242
if let requirement = self.requirement {
43-
return .git(identity: identity,
43+
return .scm(identity: identity,
4444
name: self.name,
4545
location: location,
4646
requirement: requirement,

‎Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ public extension PackageDependencyDescription {
3535
productFilter: productFilter)
3636
}
3737

38-
static func git(identity: PackageIdentity? = nil,
38+
static func scm(identity: PackageIdentity? = nil,
3939
name: String? = nil,
4040
location: String,
4141
requirement: Requirement,
4242
productFilter: ProductFilter = .everything
4343
) -> PackageDependencyDescription {
4444
let identity = identity ?? PackageIdentity(url: location)
45-
return .git(identity: identity,
45+
return .scm(identity: identity,
4646
name: name,
4747
location: location,
4848
requirement: requirement,

‎Sources/Workspace/Workspace.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2555,7 +2555,7 @@ extension PackageDependencyDescription {
25552555
switch self {
25562556
case .local(let data):
25572557
return data.path.pathString
2558-
case .git(let data):
2558+
case .scm(let data):
25592559
return data.location
25602560
}
25612561
}

‎Tests/BuildTests/BuildPlanTests.swift

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ final class BuildPlanTests: XCTestCase {
275275
path: "/Pkg",
276276
packageLocation: "/Pkg",
277277
dependencies: [
278-
.git(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
278+
.scm(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
279279
],
280280
targets: [
281281
TargetDescription(name: "exe", dependencies: [
@@ -379,7 +379,7 @@ final class BuildPlanTests: XCTestCase {
379379
packageKind: .root,
380380
packageLocation: "/A",
381381
dependencies: [
382-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
382+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
383383
],
384384
targets: [
385385
TargetDescription(name: "ATarget", dependencies: ["BLibrary"]),
@@ -486,7 +486,7 @@ final class BuildPlanTests: XCTestCase {
486486
packageKind: .root,
487487
packageLocation: "/Pkg",
488488
dependencies: [
489-
.git(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
489+
.scm(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
490490
],
491491
targets: [
492492
TargetDescription(name: "exe", dependencies: ["lib"]),
@@ -598,7 +598,7 @@ final class BuildPlanTests: XCTestCase {
598598
path: "/Pkg",
599599
packageLocation: "/Pkg",
600600
dependencies: [
601-
.git(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
601+
.scm(location: "/ExtPkg", requirement: .upToNextMajor(from: "1.0.0")),
602602
],
603603
targets: [
604604
TargetDescription(name: "exe", dependencies: [
@@ -855,7 +855,7 @@ final class BuildPlanTests: XCTestCase {
855855
packageKind: .root,
856856
packageLocation: "/Pkg",
857857
dependencies: [
858-
.git(location: "/Dep", requirement: .upToNextMajor(from: "1.0.0")),
858+
.scm(location: "/Dep", requirement: .upToNextMajor(from: "1.0.0")),
859859
],
860860
targets: [
861861
TargetDescription(name: "exe", dependencies: ["swiftlib"]),
@@ -966,7 +966,7 @@ final class BuildPlanTests: XCTestCase {
966966
packageKind: .root,
967967
packageLocation: "/Pkg",
968968
dependencies: [
969-
.git(location: "Clibgit", requirement: .upToNextMajor(from: "1.0.0"))
969+
.scm(location: "Clibgit", requirement: .upToNextMajor(from: "1.0.0"))
970970
],
971971
targets: [
972972
TargetDescription(name: "exe", dependencies: []),
@@ -1068,7 +1068,7 @@ final class BuildPlanTests: XCTestCase {
10681068
packageKind: .root,
10691069
packageLocation: "/Foo",
10701070
dependencies: [
1071-
.git(location: "/Bar", requirement: .upToNextMajor(from: "1.0.0")),
1071+
.scm(location: "/Bar", requirement: .upToNextMajor(from: "1.0.0")),
10721072
],
10731073
targets: [
10741074
TargetDescription(name: "Foo", dependencies: ["Bar-Baz"]),
@@ -1278,8 +1278,8 @@ final class BuildPlanTests: XCTestCase {
12781278
packageKind: .root,
12791279
packageLocation: "/A",
12801280
dependencies: [
1281-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1282-
.git(location: "/C", requirement: .upToNextMajor(from: "1.0.0")),
1281+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1282+
.scm(location: "/C", requirement: .upToNextMajor(from: "1.0.0")),
12831283
],
12841284
products: [
12851285
ProductDescription(name: "aexec", type: .executable, targets: ["ATarget"])
@@ -1369,8 +1369,8 @@ final class BuildPlanTests: XCTestCase {
13691369
path: "/A",
13701370
packageLocation: "/A",
13711371
dependencies: [
1372-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1373-
.git(location: "/C", requirement: .upToNextMajor(from: "1.0.0")),
1372+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1373+
.scm(location: "/C", requirement: .upToNextMajor(from: "1.0.0")),
13741374
],
13751375
products: [
13761376
ProductDescription(name: "aexec", type: .executable, targets: ["ATarget"]),
@@ -1780,7 +1780,7 @@ final class BuildPlanTests: XCTestCase {
17801780
],
17811781
v: .v5,
17821782
dependencies: [
1783-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1783+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
17841784
],
17851785
targets: [
17861786
TargetDescription(name: "ATarget", dependencies: ["BLibrary"]),
@@ -1843,7 +1843,7 @@ final class BuildPlanTests: XCTestCase {
18431843
],
18441844
v: .v5,
18451845
dependencies: [
1846-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1846+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
18471847
],
18481848
targets: [
18491849
TargetDescription(name: "ATarget", dependencies: ["BLibrary"]),
@@ -1905,7 +1905,7 @@ final class BuildPlanTests: XCTestCase {
19051905
packageLocation: "/A",
19061906
v: .v5,
19071907
dependencies: [
1908-
.git(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
1908+
.scm(location: "/B", requirement: .upToNextMajor(from: "1.0.0")),
19091909
],
19101910
targets: [
19111911
try TargetDescription(
@@ -2083,7 +2083,7 @@ final class BuildPlanTests: XCTestCase {
20832083
packageKind: .root,
20842084
packageLocation: "/PkgB",
20852085
dependencies: [
2086-
.git(location: "/PkgA", requirement: .upToNextMajor(from: "1.0.0")),
2086+
.scm(location: "/PkgA", requirement: .upToNextMajor(from: "1.0.0")),
20872087
],
20882088
targets: [
20892089
TargetDescription(name: "PkgB", dependencies: ["swiftlib"]),
@@ -2178,7 +2178,7 @@ final class BuildPlanTests: XCTestCase {
21782178
packageKind: .root,
21792179
packageLocation: "/PkgA",
21802180
dependencies: [
2181-
.git(location: "/PkgB", requirement: .upToNextMajor(from: "1.0.0")),
2181+
.scm(location: "/PkgB", requirement: .upToNextMajor(from: "1.0.0")),
21822182
],
21832183
targets: [
21842184
TargetDescription(name: "Bar", dependencies: ["Foo"]),
@@ -2246,7 +2246,7 @@ final class BuildPlanTests: XCTestCase {
22462246
packageKind: .root,
22472247
packageLocation: "/PkgA",
22482248
dependencies: [
2249-
.git(location: "/PkgB", requirement: .upToNextMajor(from: "1.0.0")),
2249+
.scm(location: "/PkgB", requirement: .upToNextMajor(from: "1.0.0")),
22502250
],
22512251
targets: [
22522252
TargetDescription(name: "Bar", dependencies: ["Foo"]),

‎Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class PackageGraphPerfTests: XCTestCasePerf {
3939
} else {
4040
let depName = "Foo\(pkg + 1)"
4141
let depUrl = "/\(depName)"
42-
dependencies = [.git(name: depName, location: depUrl, requirement: .upToNextMajor(from: "1.0.0"))]
42+
dependencies = [.scm(name: depName, location: depUrl, requirement: .upToNextMajor(from: "1.0.0"))]
4343
targets = [try TargetDescription(name: name, dependencies: [.byName(name: depName, condition: nil)], path: ".")]
4444
}
4545
// Create manifest.

0 commit comments

Comments
 (0)