-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #102 from jakeva/develop
Implement git status and diffs
- Loading branch information
Showing
6 changed files
with
596 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // | ||
| // Diffs.swift | ||
| // SwiftGit2 | ||
| // | ||
| // Created by Jake Van Alstyne on 8/20/17. | ||
| // Copyright © 2017 GitHub, Inc. All rights reserved. | ||
| // | ||
| import Foundation | ||
| import libgit2 | ||
|
|
||
| public struct StatusEntry { | ||
| public var status: Diff.Status | ||
| public var headToIndex: Diff.Delta? | ||
| public var indexToWorkDir: Diff.Delta? | ||
|
|
||
| public init(from statusEntry: git_status_entry) { | ||
| self.status = Diff.Status(rawValue: statusEntry.status.rawValue) | ||
|
|
||
| if let htoi = statusEntry.head_to_index { | ||
| self.headToIndex = Diff.Delta(htoi.pointee) | ||
| } | ||
|
|
||
| if let itow = statusEntry.index_to_workdir { | ||
| self.indexToWorkDir = Diff.Delta(itow.pointee) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public struct Diff { | ||
|
|
||
| /// The set of deltas. | ||
| public var deltas = [Delta]() | ||
|
|
||
| public struct Delta { | ||
| public static let type = GIT_OBJ_REF_DELTA | ||
|
|
||
| public var status: Status | ||
| public var flags: Flags | ||
| public var oldFile: File? | ||
| public var newFile: File? | ||
|
|
||
| public init(_ delta: git_diff_delta) { | ||
| self.status = Status(rawValue: UInt32(git_diff_status_char(delta.status))) | ||
| self.flags = Flags(rawValue: delta.flags) | ||
| self.oldFile = File(delta.old_file) | ||
| self.newFile = File(delta.new_file) | ||
| } | ||
| } | ||
|
|
||
| public struct File { | ||
| public var oid: OID | ||
| public var path: String | ||
| public var size: Int64 | ||
| public var flags: Flags | ||
|
|
||
| public init(_ diffFile: git_diff_file) { | ||
| self.oid = OID(diffFile.id) | ||
| let path = diffFile.path | ||
| self.path = path.map(String.init(cString:))! | ||
| self.size = diffFile.size | ||
| self.flags = Flags(rawValue: diffFile.flags) | ||
| } | ||
| } | ||
|
|
||
| public struct Status: OptionSet { | ||
| // This appears to be necessary due to bug in Swift | ||
| // https://bugs.swift.org/browse/SR-3003 | ||
| public init(rawValue: UInt32) { | ||
| self.rawValue = rawValue | ||
| } | ||
| 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 struct Flags: OptionSet { | ||
| // This appears to be necessary due to bug in Swift | ||
| // https://bugs.swift.org/browse/SR-3003 | ||
| public init(rawValue: UInt32) { | ||
| self.rawValue = rawValue | ||
| } | ||
| public let rawValue: UInt32 | ||
|
|
||
| public static let binary = Flags(rawValue: 0) | ||
| public static let notBinary = Flags(rawValue: 1 << 0) | ||
| public static let validId = Flags(rawValue: 1 << 1) | ||
| public static let exists = Flags(rawValue: 1 << 2) | ||
| } | ||
|
|
||
| /// Create an instance with a libgit2 `git_diff`. | ||
| public init(_ pointer: OpaquePointer) { | ||
| for i in 0..<git_diff_num_deltas(pointer) { | ||
| if let delta = git_diff_get_delta(pointer, i) { | ||
| deltas.append(Diff.Delta(delta.pointee)) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.