diff options
| author | Ben Straub <bs@github.com> | 2013-10-28 11:04:58 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-28 11:04:58 -0700 |
| commit | 42c8f8f807fe986534e0cbabbfabc32cb4eb9077 (patch) | |
| tree | fa76cb66e6d49855be344026b1cbe31d03962916 /src/diff_patch.h | |
| parent | a7d28f40a2a01382b76c55ca0a0672c177adaf69 (diff) | |
| parent | 5c50f22a93c78190fb7d81802199ff9defc8cf55 (diff) | |
| download | libgit2-42c8f8f807fe986534e0cbabbfabc32cb4eb9077.tar.gz | |
Merge remote-tracking branch 'libgit2/development' into blame
Diffstat (limited to 'src/diff_patch.h')
| -rw-r--r-- | src/diff_patch.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/diff_patch.h b/src/diff_patch.h index 56af14600..df2ba4c31 100644 --- a/src/diff_patch.h +++ b/src/diff_patch.h @@ -11,19 +11,20 @@ #include "diff.h" #include "diff_file.h" #include "array.h" +#include "git2/patch.h" -extern git_diff_list *git_diff_patch__diff(git_diff_patch *); +extern git_diff *git_patch__diff(git_patch *); -extern git_diff_driver *git_diff_patch__driver(git_diff_patch *); +extern git_diff_driver *git_patch__driver(git_patch *); -extern void git_diff_patch__old_data(char **, size_t *, git_diff_patch *); -extern void git_diff_patch__new_data(char **, size_t *, git_diff_patch *); +extern void git_patch__old_data(char **, size_t *, git_patch *); +extern void git_patch__new_data(char **, size_t *, git_patch *); -extern int git_diff_patch__invoke_callbacks( - git_diff_patch *patch, +extern int git_patch__invoke_callbacks( + git_patch *patch, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb line_cb, + git_diff_line_cb line_cb, void *payload); typedef struct git_diff_output git_diff_output; @@ -31,7 +32,7 @@ struct git_diff_output { /* these callbacks are issued with the diff data */ git_diff_file_cb file_cb; git_diff_hunk_cb hunk_cb; - git_diff_data_cb data_cb; + git_diff_line_cb data_cb; void *payload; /* this records the actual error in cases where it may be obscured */ @@ -40,7 +41,7 @@ struct git_diff_output { /* this callback is used to do the diff and drive the other callbacks. * see diff_xdiff.h for how to use this in practice for now. */ - int (*diff_cb)(git_diff_output *output, git_diff_patch *patch); + int (*diff_cb)(git_diff_output *output, git_patch *patch); }; #endif |