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

More diff functionality #629

Merged
mbfr merged 24 commits from feature-diff-extra into master 2020-08-18 08:14:03 -05:00
Conversation 0 Commits 24 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 6dc7641069 - Show all commits

8
diff.go
View File

@ -849,16 +849,16 @@ func DiffBlobs(oldBlob *Blob, oldAsPath string, newBlob *Blob, newAsPath string,
return nil return nil
} }
type ApplyHunkCb func(*DiffHunk) (apply bool, err error) type ApplyHunkCallback func(*DiffHunk) (apply bool, err error)
type ApplyDeltaCb func(*DiffDelta) (apply bool, err error) type ApplyDeltaCallback func(*DiffDelta) (apply bool, err error)
// ApplyOptions has 2 callbacks that are called for hunks or deltas // ApplyOptions has 2 callbacks that are called for hunks or deltas
// If these functions return an error, abort the apply process immediately. // If these functions return an error, abort the apply process immediately.
// If the first return value is true, the delta/hunk will be applied. If it is false, the delta/hunk will not be applied. In either case, the rest of the apply process will continue. // If the first return value is true, the delta/hunk will be applied. If it is false, the delta/hunk will not be applied. In either case, the rest of the apply process will continue.
type ApplyOptions struct { type ApplyOptions struct {
Version uint Version uint
ApplyHunkCallback ApplyHunkCb ApplyHunkCallback ApplyHunkCallback
ApplyDeltaCallback ApplyDeltaCb ApplyDeltaCallback ApplyDeltaCallback
Flags uint Flags uint
} }