jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Bundle consts more idiomatically; add GitLineType alias.

This commit is contained in:
lye 2014-02-26 05:58:45 -06:00
parent 2e5102b71a
commit 45b0f17c04
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
diff.go
View File

@ -11,24 +11,28 @@ import (
"unsafe" "unsafe"
) )
type Delta int
type DiffFlag int type DiffFlag int
const ( const (
DiffFlagBinary = DiffFlag(C.GIT_DIFF_FLAG_BINARY) DiffFlagBinary = C.GIT_DIFF_FLAG_BINARY
DiffFlagNotBinary = DiffFlag(C.GIT_DIFF_FLAG_NOT_BINARY) DiffFlagNotBinary = C.GIT_DIFF_FLAG_NOT_BINARY
DiffFlagValidOid = DiffFlag(C.GIT_DIFF_FLAG_VALID_OID) DiffFlagValidOid = C.GIT_DIFF_FLAG_VALID_OID
)
DeltaUnmodified = Delta(C.GIT_DELTA_UNMODIFIED) type Delta int
DeltaAdded = Delta(C.GIT_DELTA_ADDED) const (
DeltaDeleted = Delta(C.GIT_DELTA_DELETED) DeltaUnmodified = C.GIT_DELTA_UNMODIFIED
DeltaModified = Delta(C.GIT_DELTA_MODIFIED) DeltaAdded = C.GIT_DELTA_ADDED
DeltaRenamed = Delta(C.GIT_DELTA_RENAMED) DeltaDeleted = C.GIT_DELTA_DELETED
DeltaCopied = Delta(C.GIT_DELTA_COPIED) DeltaModified = C.GIT_DELTA_MODIFIED
DeltaIgnored = Delta(C.GIT_DELTA_IGNORED) DeltaRenamed = C.GIT_DELTA_RENAMED
DeltaUntracked = Delta(C.GIT_DELTA_UNTRACKED) DeltaCopied = C.GIT_DELTA_COPIED
DeltaTypeChange = Delta(C.GIT_DELTA_TYPECHANGE) DeltaIgnored = C.GIT_DELTA_IGNORED
DeltaUntracked = C.GIT_DELTA_UNTRACKED
DeltaTypeChange = C.GIT_DELTA_TYPECHANGE
)
type DiffLineType int
const (
DiffLineContext = C.GIT_DIFF_LINE_CONTEXT DiffLineContext = C.GIT_DIFF_LINE_CONTEXT
DiffLineAddition = C.GIT_DIFF_LINE_ADDITION DiffLineAddition = C.GIT_DIFF_LINE_ADDITION
DiffLineDeletion = C.GIT_DIFF_LINE_DELETION DiffLineDeletion = C.GIT_DIFF_LINE_DELETION
@ -126,7 +130,7 @@ func (dh *DiffHunk) NewLines() int {
} }
type DiffLine struct { type DiffLine struct {
Origin byte Origin DiffLineType
OldLineno int OldLineno int
NewLineno int NewLineno int
NumLines int NumLines int
@ -136,7 +140,7 @@ type DiffLine struct {
func newDiffLine(delta *C.git_diff_delta, hunk *C.git_diff_hunk, line *C.git_diff_line) *DiffLine { func newDiffLine(delta *C.git_diff_delta, hunk *C.git_diff_hunk, line *C.git_diff_line) *DiffLine {
return &DiffLine{ return &DiffLine{
Origin: byte(line.origin), Origin: DiffLineType(line.origin),
OldLineno: int(line.old_lineno), OldLineno: int(line.old_lineno),
NewLineno: int(line.new_lineno), NewLineno: int(line.new_lineno),
NumLines: int(line.num_lines), NumLines: int(line.num_lines),