From db0a955e03f730fb29758c5c8e229c4a896f1432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jake=20Van=20Alstyne=20=F0=9F=8E=A9?= Date: Fri, 17 Nov 2017 16:49:16 -0700 Subject: [PATCH] clean up various xcode warnings --- SwiftGit2/CommitIterator.swift | 42 +++--- SwiftGit2/Diffs.swift | 28 ++-- SwiftGit2/References.swift | 4 +- SwiftGit2Tests/RepositorySpec.swift | 208 ++++++++++++++-------------- 4 files changed, 141 insertions(+), 141 deletions(-) diff --git a/SwiftGit2/CommitIterator.swift b/SwiftGit2/CommitIterator.swift index da6b364..eb701bc 100644 --- a/SwiftGit2/CommitIterator.swift +++ b/SwiftGit2/CommitIterator.swift @@ -10,11 +10,11 @@ public class CommitIterator: IteratorProtocol, Sequence { public typealias Iterator = CommitIterator public typealias Element = Result let repo: Repository - private var revisionWalker: OpaquePointer? = nil + private var revisionWalker: OpaquePointer? private enum Next { case over - case ok + case okay case error(NSError) init(_ result: Int32, name: String) { @@ -22,7 +22,7 @@ public class CommitIterator: IteratorProtocol, Sequence { case GIT_ITEROVER.rawValue: self = .over case GIT_OK.rawValue: - self = .ok + self = .okay default: self = .error(NSError(gitError: result, pointOfFailure: name)) } @@ -55,7 +55,7 @@ public class CommitIterator: IteratorProtocol, Sequence { return Result.failure(error) case .over: return nil - case .ok: + case .okay: var unsafeCommit: OpaquePointer? = nil let lookupGitResult = git_commit_lookup(&unsafeCommit, repo.pointer, &oid) guard lookupGitResult == GIT_OK.rawValue, @@ -67,76 +67,76 @@ public class CommitIterator: IteratorProtocol, Sequence { return result } } - + public func makeIterator() -> CommitIterator { return self } - + public private(set) var underestimatedCount: Int = 0 public func map(_ transform: (Result) throws -> T) rethrows -> [T] { var new: [T] = [] for item in self { - new = new + [try transform(item)] + new += [try transform(item)] } return new } - + public func filter(_ isIncluded: (Result) throws -> Bool) rethrows -> [Result] { var new: [Result] = [] for item in self { if try isIncluded(item) { - new = new + [item] + new += [item] } } return new } - + public func forEach(_ body: (Result) throws -> Void) rethrows { for item in self { try body(item) } } - + private func notImplemented(functionName: Any) { assert(false, "CommitIterator does not implement \(functionName)") } private init(repo: Repository) { self.repo = repo } - - public func dropFirst(_ n: Int) -> AnySequence { + + public func dropFirst(_ num: Int) -> AnySequence { notImplemented(functionName: self.dropFirst) return AnySequence { return CommitIterator(repo: self.repo) } } - - public func dropLast(_ n: Int) -> AnySequence { + + public func dropLast(_ num: Int) -> AnySequence { notImplemented(functionName: self.dropLast) return AnySequence { return CommitIterator(repo: self.repo) } } - + public func drop(while predicate: (Result) throws -> Bool) rethrows -> AnySequence { notImplemented(functionName: self.drop) return AnySequence { return CommitIterator(repo: self.repo) } } - + public func prefix(_ maxLength: Int) -> AnySequence { notImplemented(functionName: "prefix(_ maxLength:") return AnySequence { return CommitIterator(repo: self.repo) } } - + public func prefix(while predicate: (Result) throws -> Bool) rethrows -> AnySequence { notImplemented(functionName: "prefix(with predicate:") return AnySequence { return CommitIterator(repo: self.repo) } } - + public func suffix(_ maxLength: Int) -> AnySequence { notImplemented(functionName: self.suffix) return AnySequence { return CommitIterator(repo: self.repo) } } - + public func split(maxSplits: Int, omittingEmptySubsequences: Bool, whereSeparator isSeparator: (Result) throws -> Bool) rethrows -> [AnySequence] { notImplemented(functionName: self.split) return [AnySequence { return CommitIterator(repo: self.repo) }] } - + } diff --git a/SwiftGit2/Diffs.swift b/SwiftGit2/Diffs.swift index a770749..da5d6fa 100644 --- a/SwiftGit2/Diffs.swift +++ b/SwiftGit2/Diffs.swift @@ -49,20 +49,20 @@ public struct Diff { } public let rawValue: UInt32 - public static let current = Status(rawValue: 0) - public static let indexNew = Status(rawValue: 1 << 0) - public static let indexModified = Status(rawValue: 1 << 1) - public static let indexDeleted = Status(rawValue: 1 << 2) - public static let indexRenamed = Status(rawValue: 1 << 3) - public static let indexTypeChange = Status(rawValue: 1 << 4) - public static let workTreeNew = Status(rawValue: 1 << 5) - public static let workTreeModified = Status(rawValue: 1 << 6) - public static let workTreeDeleted = Status(rawValue: 1 << 7) - public static let workTreeTypeChange = Status(rawValue: 1 << 8) - public static let workTreeRenamed = Status(rawValue: 1 << 9) - public static let workTreeUnreadable = Status(rawValue: 1 << 10) - public static let ignored = Status(rawValue: 1 << 11) - public static let conflicted = Status(rawValue: 1 << 12) + public static let current = Status(rawValue: 0) + public static let indexNew = Status(rawValue: 1 << 0) + public static let indexModified = Status(rawValue: 1 << 1) + public static let indexDeleted = Status(rawValue: 1 << 2) + public static let indexRenamed = Status(rawValue: 1 << 3) + public static let indexTypeChange = Status(rawValue: 1 << 4) + public static let workTreeNew = Status(rawValue: 1 << 5) + public static let workTreeModified = Status(rawValue: 1 << 6) + public static let workTreeDeleted = Status(rawValue: 1 << 7) + public static let workTreeTypeChange = Status(rawValue: 1 << 8) + public static let workTreeRenamed = Status(rawValue: 1 << 9) + public static let workTreeUnreadable = Status(rawValue: 1 << 10) + public static let ignored = Status(rawValue: 1 << 11) + public static let conflicted = Status(rawValue: 1 << 12) } public struct Flags: OptionSet { diff --git a/SwiftGit2/References.swift b/SwiftGit2/References.swift index 67389c4..8d88c33 100644 --- a/SwiftGit2/References.swift +++ b/SwiftGit2/References.swift @@ -102,9 +102,9 @@ public struct Branch: ReferenceType { return nil } name = String(validatingUTF8: namePointer!)! - + longName = String(validatingUTF8: git_reference_name(pointer))! - + var oid: OID if git_reference_type(pointer).rawValue == GIT_REF_SYMBOLIC.rawValue { var resolved: OpaquePointer? = nil diff --git a/SwiftGit2Tests/RepositorySpec.swift b/SwiftGit2Tests/RepositorySpec.swift index 555605b..330078d 100644 --- a/SwiftGit2Tests/RepositorySpec.swift +++ b/SwiftGit2Tests/RepositorySpec.swift @@ -19,7 +19,7 @@ class RepositorySpec: QuickSpec { let repo = Fixtures.simpleRepository expect(repo.directoryURL).notTo(beNil()) } - + it("should fail if the repo doesn't exist") { let url = URL(fileURLWithPath: "blah") let result = Repository.at(url) @@ -49,68 +49,68 @@ class RepositorySpec: QuickSpec { let remoteRepo = Fixtures.simpleRepository let localURL = self.temporaryURL(forPurpose: "local-clone") let result = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true) - + expect(result).to(haveSucceeded()) - + if case .success(let clonedRepo) = result { expect(clonedRepo.directoryURL).notTo(beNil()) } } - + it("should handle bare clones") { let remoteRepo = Fixtures.simpleRepository let localURL = self.temporaryURL(forPurpose: "bare-clone") let result = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true, bare: true) - + expect(result).to(haveSucceeded()) - + if case .success(let clonedRepo) = result { expect(clonedRepo.directoryURL).to(beNil()) } } - + it("should have set a valid remote url") { let remoteRepo = Fixtures.simpleRepository let localURL = self.temporaryURL(forPurpose: "valid-remote-clone") let cloneResult = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true) - + expect(cloneResult).to(haveSucceeded()) - + if case .success(let clonedRepo) = cloneResult { let remoteResult = clonedRepo.remote(named: "origin") expect(remoteResult).to(haveSucceeded()) - + if case .success(let remote) = remoteResult { expect(remote.URL).to(equal(remoteRepo.directoryURL?.absoluteString)) } } } - + it("should be able to clone a remote repository") { let remoteRepoURL = URL(string: "https://github.com/libgit2/libgit2.github.com.git") let localURL = self.temporaryURL(forPurpose: "public-remote-clone") let cloneResult = Repository.clone(from: remoteRepoURL!, to: localURL) - + expect(cloneResult).to(haveSucceeded()) - + if case .success(let clonedRepo) = cloneResult { let remoteResult = clonedRepo.remote(named: "origin") expect(remoteResult).to(haveSucceeded()) - + if case .success(let remote) = remoteResult { expect(remote.URL).to(equal(remoteRepoURL?.absoluteString)) } } } - + let env = ProcessInfo.processInfo.environment - + if let privateRepo = env["SG2TestPrivateRepo"], let gitUsername = env["SG2TestUsername"], let publicKey = env["SG2TestPublicKey"], let privateKey = env["SG2TestPrivateKey"], let passphrase = env["SG2TestPassphrase"] { - + it("should be able to clone a remote repository requiring credentials") { let remoteRepoURL = URL(string: privateRepo) let localURL = self.temporaryURL(forPurpose: "private-remote-clone") @@ -118,15 +118,15 @@ class RepositorySpec: QuickSpec { publicKey: publicKey, privateKey: privateKey, passphrase: passphrase) - + let cloneResult = Repository.clone(from: remoteRepoURL!, to: localURL, credentials: credentials) - + expect(cloneResult).to(haveSucceeded()) - + if case .success(let clonedRepo) = cloneResult { let remoteResult = clonedRepo.remote(named: "origin") expect(remoteResult).to(haveSucceeded()) - + if case .success(let remote) = remoteResult { expect(remote.URL).to(equal(remoteRepoURL?.absoluteString)) } @@ -134,115 +134,115 @@ class RepositorySpec: QuickSpec { } } } - + describe("Repository.blob(_:)") { it("should return the commit if it exists") { let repo = Fixtures.simpleRepository let oid = OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")! - + let result = repo.blob(oid) expect(result.map { $0.oid }).to(haveSucceeded(equal(oid))) } - + it("should error if the blob doesn't exist") { let repo = Fixtures.simpleRepository let oid = OID(string: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")! - + let result = repo.blob(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } - + it("should error if the oid doesn't point to a blob") { let repo = Fixtures.simpleRepository // This is a tree in the repository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! - + let result = repo.blob(oid) expect(result).to(haveFailed()) } } - + describe("Repository.commit(_:)") { it("should return the commit if it exists") { let repo = Fixtures.simpleRepository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! - + let result = repo.commit(oid) expect(result.map { $0.oid }).to(haveSucceeded(equal(oid))) } - + it("should error if the commit doesn't exist") { let repo = Fixtures.simpleRepository let oid = OID(string: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")! - + let result = repo.commit(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } - + it("should error if the oid doesn't point to a commit") { let repo = Fixtures.simpleRepository // This is a tree in the repository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! - + let result = repo.commit(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.tag(_:)") { it("should return the tag if it exists") { let repo = Fixtures.simpleRepository let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")! - + let result = repo.tag(oid) expect(result.map { $0.oid }).to(haveSucceeded(equal(oid))) } - + it("should error if the tag doesn't exist") { let repo = Fixtures.simpleRepository let oid = OID(string: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")! - + let result = repo.tag(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } - + it("should error if the oid doesn't point to a tag") { let repo = Fixtures.simpleRepository // This is a commit in the repository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! - + let result = repo.tag(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.tree(_:)") { it("should return the tree if it exists") { let repo = Fixtures.simpleRepository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! - + let result = repo.tree(oid) expect(result.map { $0.oid }).to(haveSucceeded(equal(oid))) } - + it("should error if the tree doesn't exist") { let repo = Fixtures.simpleRepository let oid = OID(string: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")! - + let result = repo.tree(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } - + it("should error if the oid doesn't point to a tree") { let repo = Fixtures.simpleRepository // This is a commit in the repository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! - + let result = repo.tree(oid) expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.object(_:)") { it("should work with a blob") { let repo = Fixtures.simpleRepository @@ -251,7 +251,7 @@ class RepositorySpec: QuickSpec { let result = repo.object(oid) expect(result.map { $0 as! Blob }).to(haveSucceeded(equal(blob))) } - + it("should work with a commit") { let repo = Fixtures.simpleRepository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! @@ -259,7 +259,7 @@ class RepositorySpec: QuickSpec { let result = repo.object(oid) expect(result.map { $0 as! Commit }).to(haveSucceeded(equal(commit))) } - + it("should work with a tag") { let repo = Fixtures.simpleRepository let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")! @@ -267,7 +267,7 @@ class RepositorySpec: QuickSpec { let result = repo.object(oid) expect(result.map { $0 as! Tag }).to(haveSucceeded(equal(tag))) } - + it("should work with a tree") { let repo = Fixtures.simpleRepository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! @@ -275,7 +275,7 @@ class RepositorySpec: QuickSpec { let result = repo.object(oid) expect(result.map { $0 as! Tree }).to(haveSucceeded(equal(tree))) } - + it("should error if there's no object with that oid") { let repo = Fixtures.simpleRepository let oid = OID(string: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")! @@ -283,94 +283,94 @@ class RepositorySpec: QuickSpec { expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.object(from: PointerTo)") { it("should work with commits") { let repo = Fixtures.simpleRepository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! - + let pointer = PointerTo(oid) let commit = repo.commit(oid).value! expect(repo.object(from: pointer)).to(haveSucceeded(equal(commit))) } - + it("should work with trees") { let repo = Fixtures.simpleRepository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! - + let pointer = PointerTo(oid) let tree = repo.tree(oid).value! expect(repo.object(from: pointer)).to(haveSucceeded(equal(tree))) } - + it("should work with blobs") { let repo = Fixtures.simpleRepository let oid = OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")! - + let pointer = PointerTo(oid) let blob = repo.blob(oid).value! expect(repo.object(from: pointer)).to(haveSucceeded(equal(blob))) } - + it("should work with tags") { let repo = Fixtures.simpleRepository let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")! - + let pointer = PointerTo(oid) let tag = repo.tag(oid).value! expect(repo.object(from: pointer)).to(haveSucceeded(equal(tag))) } } - + describe("Repository.object(from: Pointer)") { it("should work with commits") { let repo = Fixtures.simpleRepository let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! - + let pointer = Pointer.commit(oid) let commit = repo.commit(oid).value! let result = repo.object(from: pointer).map { $0 as! Commit } expect(result).to(haveSucceeded(equal(commit))) } - + it("should work with trees") { let repo = Fixtures.simpleRepository let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! - + let pointer = Pointer.tree(oid) let tree = repo.tree(oid).value! let result = repo.object(from: pointer).map { $0 as! Tree } expect(result).to(haveSucceeded(equal(tree))) } - + it("should work with blobs") { let repo = Fixtures.simpleRepository let oid = OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")! - + let pointer = Pointer.blob(oid) let blob = repo.blob(oid).value! let result = repo.object(from: pointer).map { $0 as! Blob } expect(result).to(haveSucceeded(equal(blob))) } - + it("should work with tags") { let repo = Fixtures.simpleRepository let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")! - + let pointer = Pointer.tag(oid) let tag = repo.tag(oid).value! let result = repo.object(from: pointer).map { $0 as! Tag } expect(result).to(haveSucceeded(equal(tag))) } } - + describe("Repository.allRemotes()") { it("should return an empty list if there are no remotes") { let repo = Fixtures.simpleRepository let result = repo.allRemotes() expect(result).to(haveSucceeded(beEmpty())) } - + it("should return all the remotes") { let repo = Fixtures.mantleRepository let remotes = repo.allRemotes() @@ -379,21 +379,21 @@ class RepositorySpec: QuickSpec { expect(names).to(haveSucceeded(contain("origin", "upstream"))) } } - + describe("Repository.remote(named:)") { it("should return the remote if it exists") { let repo = Fixtures.mantleRepository let result = repo.remote(named: "upstream") expect(result.map { $0.name }).to(haveSucceeded(equal("upstream"))) } - + it("should error if the remote doesn't exist") { let repo = Fixtures.simpleRepository let result = repo.remote(named: "nonexistent") expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.reference(named:)") { it("should return a local branch if it exists") { let name = "refs/heads/master" @@ -401,33 +401,33 @@ class RepositorySpec: QuickSpec { expect(result.map { $0.longName }).to(haveSucceeded(equal(name))) expect(result.value as? Branch).notTo(beNil()) } - + it("should return a remote branch if it exists") { let name = "refs/remotes/upstream/master" let result = Fixtures.mantleRepository.reference(named: name) expect(result.map { $0.longName }).to(haveSucceeded(equal(name))) expect(result.value as? Branch).notTo(beNil()) } - + it("should return a tag if it exists") { let name = "refs/tags/tag-2" let result = Fixtures.simpleRepository.reference(named: name) expect(result.value?.longName).to(equal(name)) expect(result.value as? TagReference).notTo(beNil()) } - + it("should return the reference if it exists") { let name = "refs/other-ref" let result = Fixtures.simpleRepository.reference(named: name) expect(result.value?.longName).to(equal(name)) } - + it("should error if the reference doesn't exist") { let result = Fixtures.simpleRepository.reference(named: "refs/heads/nonexistent") expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.localBranches()") { it("should return all the local branches") { let repo = Fixtures.simpleRepository @@ -439,7 +439,7 @@ class RepositorySpec: QuickSpec { expect(repo.localBranches().value).to(equal(expected)) } } - + describe("Repository.remoteBranches()") { it("should return all the remote branches") { let repo = Fixtures.mantleRepository @@ -470,31 +470,31 @@ class RepositorySpec: QuickSpec { expect(actual.map { $0.name }).to(equal(expectedNames)) } } - + describe("Repository.localBranch(named:)") { it("should return the branch if it exists") { let result = Fixtures.simpleRepository.localBranch(named: "master") expect(result.value?.longName).to(equal("refs/heads/master")) } - + it("should error if the branch doesn't exists") { let result = Fixtures.simpleRepository.localBranch(named: "nonexistent") expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.remoteBranch(named:)") { it("should return the branch if it exists") { let result = Fixtures.mantleRepository.remoteBranch(named: "upstream/master") expect(result.value?.longName).to(equal("refs/remotes/upstream/master")) } - + it("should error if the branch doesn't exists") { let result = Fixtures.simpleRepository.remoteBranch(named: "origin/nonexistent") expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.allTags()") { it("should return all the tags") { let repo = Fixtures.simpleRepository @@ -505,19 +505,19 @@ class RepositorySpec: QuickSpec { expect(repo.allTags().value).to(equal(expected)) } } - + describe("Repository.tag(named:)") { it("should return the tag if it exists") { let result = Fixtures.simpleRepository.tag(named: "tag-2") expect(result.value?.longName).to(equal("refs/tags/tag-2")) } - + it("should error if the branch doesn't exists") { let result = Fixtures.simpleRepository.tag(named: "nonexistent") expect(result).to(haveFailed(beAnError(domain: equal(libGit2ErrorDomain)))) } } - + describe("Repository.HEAD()") { it("should work when on a branch") { let result = Fixtures.simpleRepository.HEAD() @@ -525,7 +525,7 @@ class RepositorySpec: QuickSpec { expect(result.value?.shortName).to(equal("master")) expect(result.value as? Branch).notTo(beNil()) } - + it("should work when on a detached HEAD") { let result = Fixtures.detachedHeadRepository.HEAD() expect(result.value?.longName).to(equal("HEAD")) @@ -534,87 +534,87 @@ class RepositorySpec: QuickSpec { expect(result.value as? Reference).notTo(beNil()) } } - + describe("Repository.setHEAD(OID)") { it("should set HEAD to the OID") { let repo = Fixtures.simpleRepository let oid = OID(string: "315b3f344221db91ddc54b269f3c9af422da0f2e")! expect(repo.HEAD().value?.shortName).to(equal("master")) - + expect(repo.setHEAD(oid)).to(haveSucceeded()) let HEAD = repo.HEAD().value expect(HEAD?.longName).to(equal("HEAD")) expect(HEAD?.oid).to(equal(oid)) - + expect(repo.setHEAD(repo.localBranch(named: "master").value!)).to(haveSucceeded()) expect(repo.HEAD().value?.shortName).to(equal("master")) } } - + describe("Repository.setHEAD(ReferenceType)") { it("should set HEAD to a branch") { let repo = Fixtures.detachedHeadRepository let oid = repo.HEAD().value!.oid expect(repo.HEAD().value?.longName).to(equal("HEAD")) - + let branch = repo.localBranch(named: "another-branch").value! expect(repo.setHEAD(branch)).to(haveSucceeded()) expect(repo.HEAD().value?.shortName).to(equal(branch.name)) - + expect(repo.setHEAD(oid)).to(haveSucceeded()) expect(repo.HEAD().value?.longName).to(equal("HEAD")) } } - + describe("Repository.checkout()") { // We're not really equipped to test this yet. :( } - + describe("Repository.checkout(OID)") { it("should set HEAD") { let repo = Fixtures.simpleRepository let oid = OID(string: "315b3f344221db91ddc54b269f3c9af422da0f2e")! expect(repo.HEAD().value?.shortName).to(equal("master")) - + expect(repo.checkout(oid, strategy: CheckoutStrategy.None)).to(haveSucceeded()) let HEAD = repo.HEAD().value expect(HEAD?.longName).to(equal("HEAD")) expect(HEAD?.oid).to(equal(oid)) - + expect(repo.checkout(repo.localBranch(named: "master").value!, strategy: CheckoutStrategy.None)).to(haveSucceeded()) expect(repo.HEAD().value?.shortName).to(equal("master")) } - + it("should call block on progress") { let repo = Fixtures.simpleRepository let oid = OID(string: "315b3f344221db91ddc54b269f3c9af422da0f2e")! expect(repo.HEAD().value?.shortName).to(equal("master")) - + expect(repo.checkout(oid, strategy: .None, progress: { (_, completedSteps, totalSteps) -> Void in expect(completedSteps).to(beLessThanOrEqualTo(totalSteps)) })).to(haveSucceeded()) - + let HEAD = repo.HEAD().value expect(HEAD?.longName).to(equal("HEAD")) expect(HEAD?.oid).to(equal(oid)) } } - + describe("Repository.checkout(ReferenceType)") { it("should set HEAD") { let repo = Fixtures.detachedHeadRepository let oid = repo.HEAD().value!.oid expect(repo.HEAD().value?.longName).to(equal("HEAD")) - + let branch = repo.localBranch(named: "another-branch").value! expect(repo.checkout(branch, strategy: CheckoutStrategy.None)).to(haveSucceeded()) expect(repo.HEAD().value?.shortName).to(equal(branch.name)) - + expect(repo.checkout(oid, strategy: CheckoutStrategy.None)).to(haveSucceeded()) expect(repo.HEAD().value?.longName).to(equal("HEAD")) } } - + describe("Repository.allCommits(in:)") { it("should return all (9) commits") { let repo = Fixtures.simpleRepository @@ -629,7 +629,7 @@ class RepositorySpec: QuickSpec { "List branches in README\n", "Create a README\n", "List branches in README\n", - "Create a README\n" + "Create a README\n", ] var commitMessages: [String] = [] for branch in branches {