vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge develop to master

Browse Source
This commit is contained in:
Arnon Keereena 2017-05-02 21:35:17 +02:00
commit d09d1f49b3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SwiftGit2/CommitIterator.swift
View File

@ -9,7 +9,6 @@ import libgit2
public class CommitIterator: IteratorProtocol { public class CommitIterator: IteratorProtocol {
public typealias Element = Result<Commit, NSError> public typealias Element = Result<Commit, NSError>
let repo: Repository let repo: Repository
private var oid: git_oid
private var revisionWalker: OpaquePointer? = nil private var revisionWalker: OpaquePointer? = nil
private enum Next { private enum Next {
@ -29,17 +28,17 @@ public class CommitIterator: IteratorProtocol {
} }
} }
init(repo: Repository, branch: Branch) { init(repo: Repository, root: git_oid) {
self.repo = repo self.repo = repo
self.oid = branch.oid.oid setupRevisionWalker(root: root)
setupRevisionWalker()
} }
deinit { deinit {
git_revwalk_free(self.revisionWalker) git_revwalk_free(self.revisionWalker)
} }
private func setupRevisionWalker() { private func setupRevisionWalker(root: git_oid) {
var oid = root
git_revwalk_new(&revisionWalker, repo.pointer) git_revwalk_new(&revisionWalker, repo.pointer)
git_revwalk_sorting(revisionWalker, GIT_SORT_TOPOLOGICAL.rawValue) git_revwalk_sorting(revisionWalker, GIT_SORT_TOPOLOGICAL.rawValue)
git_revwalk_sorting(revisionWalker, GIT_SORT_TIME.rawValue) git_revwalk_sorting(revisionWalker, GIT_SORT_TIME.rawValue)
@ -56,6 +55,7 @@ public class CommitIterator: IteratorProtocol {
public func next() -> Element? { public func next() -> Element? {
var unsafeCommit: OpaquePointer? = nil var unsafeCommit: OpaquePointer? = nil
var oid = git_oid()
let revwalkGitResult = git_revwalk_next(&oid, revisionWalker) let revwalkGitResult = git_revwalk_next(&oid, revisionWalker)
let nextResult = next(withName: "git_revwalk_next", from: revwalkGitResult) let nextResult = next(withName: "git_revwalk_next", from: revwalkGitResult)
if case let .error(error) = nextResult { if case let .error(error) = nextResult {
@ -63,7 +63,8 @@ public class CommitIterator: IteratorProtocol {
} else if case .over = nextResult { } else if case .over = nextResult {
return nil return nil
} }
guard git_commit_lookup(&unsafeCommit, repo.pointer, &oid) == GIT_OK.rawValue, let lookupGitResult = git_commit_lookup(&unsafeCommit, repo.pointer, &oid)
guard lookupGitResult == GIT_OK.rawValue,
let unwrapCommit = unsafeCommit else { let unwrapCommit = unsafeCommit else {
return nil return nil
} }

2
SwiftGit2/Repository.swift
View File

@ -523,7 +523,7 @@ final public class Repository {
if let iterator = branchCommitIteratorMap[branch] { if let iterator = branchCommitIteratorMap[branch] {
return iterator return iterator
} else { } else {
let iterator = CommitIterator(repo: self, branch: branch) let iterator = CommitIterator(repo: self, root: branch.oid.oid)
branchCommitIteratorMap[branch] = iterator branchCommitIteratorMap[branch] = iterator
return iterator return iterator
} }