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

use the DiffFlag struct instead of a UInt32

Browse Source
This commit is contained in:
Jake Van Alstyne 🎩 2017-09-01 17:16:25 -06:00
parent 48b804846f
commit 046d67ed97
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SwiftGit2/Diffs.swift
View File

@ -44,9 +44,23 @@ public struct Status: OptionSet {
static let conflicted = Status(rawValue: 1 << 12)
}
public struct DiffFlag: 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
static let binary = DiffFlag(rawValue: 0)
static let notBinary = DiffFlag(rawValue: 1 << 0)
static let validId = DiffFlag(rawValue: 1 << 1)
static let exists = DiffFlag(rawValue: 1 << 2)
}
public struct DiffDelta {
public var status: Status?
public var flags: UInt32?
public var flags: DiffFlag?
public var oldFile: DiffFile?
public var newFile: DiffFile?
@ -64,7 +78,7 @@ public struct DiffDelta {
} else {
self.status = DiffDelta.convertStatus(diffDelta.status.rawValue)
}
self.flags = diffDelta.flags
self.flags = DiffFlag(rawValue: diffDelta.flags)
self.oldFile = self.convertDiffFile(diffDelta.old_file)
self.newFile = self.convertDiffFile(diffDelta.new_file)
}
@ -110,17 +124,3 @@ public struct DiffDelta {
return newFile
}
}
public struct DiffFlag: 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
static let binary = DiffFlag(rawValue: 0)
static let notBinary = DiffFlag(rawValue: 1 << 0)
static let validId = DiffFlag(rawValue: 1 << 1)
static let exists = DiffFlag(rawValue: 1 << 2)
}