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

Add blob diffing #216

Merged
carlosmn merged 2 commits from diff into master 2015-06-30 03:56:47 -05:00
Conversation 0 Commits 2 Files Changed 3 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 86e9917919 - Show all commits

8
diff.go
View File

@ -94,7 +94,7 @@ type DiffHunk struct {
Header string Header string
} }
func diffHunkFromC(delta *C.git_diff_delta, hunk *C.git_diff_hunk) DiffHunk { func diffHunkFromC(hunk *C.git_diff_hunk) DiffHunk {
return DiffHunk{ return DiffHunk{
OldStart: int(hunk.old_start), OldStart: int(hunk.old_start),
OldLines: int(hunk.old_lines), OldLines: int(hunk.old_lines),
@ -112,7 +112,7 @@ type DiffLine struct {
Content string Content string
} }
func diffLineFromC(delta *C.git_diff_delta, hunk *C.git_diff_hunk, line *C.git_diff_line) DiffLine { func diffLineFromC(line *C.git_diff_line) DiffLine {
return DiffLine{ return DiffLine{
Origin: DiffLineType(line.origin), Origin: DiffLineType(line.origin),
OldLineno: int(line.old_lineno), OldLineno: int(line.old_lineno),
@ -309,7 +309,7 @@ func diffForEachHunkCb(delta *C.git_diff_delta, hunk *C.git_diff_hunk, handle un
data.LineCallback = nil data.LineCallback = nil
if data.HunkCallback != nil { if data.HunkCallback != nil {
cb, err := data.HunkCallback(diffHunkFromC(delta, hunk)) cb, err := data.HunkCallback(diffHunkFromC(hunk))
if err != nil { if err != nil {
data.Error = err data.Error = err
return -1 return -1
@ -330,7 +330,7 @@ func diffForEachLineCb(delta *C.git_diff_delta, hunk *C.git_diff_hunk, line *C.g
panic("could not retrieve data for handle") panic("could not retrieve data for handle")
} }
err := data.LineCallback(diffLineFromC(delta, hunk, line)) err := data.LineCallback(diffLineFromC(line))
if err != nil { if err != nil {
data.Error = err data.Error = err
return -1 return -1