New upstream version 1.4.3+dfsg.1

[libgit2.git] / src / diff.h

diff --git a/src/diff.h b/src/diff.h
index 2c0e52ca21d49cf1737d8e38958e498360922a26..2cc35e65b7c74864ae9839323c39863f3be0e8d2 100644 (file)
--- a/src/diff.h
+++ b/src/diff.h
@@ -7,13 +7,14 @@
 #ifndef INCLUDE_diff_h__
 #define INCLUDE_diff_h__
 
+#include "common.h"
+
 #include "git2/diff.h"
+#include "git2/patch.h"
 #include "git2/sys/diff.h"
 #include "git2/oid.h"
 
-#include <stdio.h>
 #include "vector.h"
-#include "buffer.h"
 #include "iterator.h"
 #include "repository.h"
 #include "pool.h"
@@ -25,18 +26,19 @@
 typedef enum {
        GIT_DIFF_TYPE_UNKNOWN = 0,
        GIT_DIFF_TYPE_GENERATED = 1,
-       GIT_DIFF_TYPE_PARSED = 2,
+       GIT_DIFF_TYPE_PARSED = 2
 } git_diff_origin_t;
 
 struct git_diff {
        git_refcount     rc;
        git_repository   *repo;
+       git_attr_session attrsession;
        git_diff_origin_t type;
        git_diff_options opts;
        git_vector       deltas;    /* vector of git_diff_delta */
        git_pool pool;
-       git_iterator_type_t old_src;
-       git_iterator_type_t new_src;
+       git_iterator_t old_src;
+       git_iterator_t new_src;
        git_diff_perfdata perf;
 
        int (*strcomp)(const char *, const char *);
@@ -44,15 +46,17 @@ struct git_diff {
        int (*pfxcomp)(const char *str, const char *pfx);
        int (*entrycomp)(const void *a, const void *b);
 
+       int (*patch_fn)(git_patch **out, git_diff *diff, size_t idx);
        void (*free_fn)(git_diff *diff);
 };
 
 extern int git_diff_delta__format_file_header(
-       git_buf *out,
+       git_str *out,
        const git_diff_delta *delta,
        const char *oldpfx,
        const char *newpfx,
-       int oid_strlen);
+       int oid_strlen,
+       bool print_index);
 
 extern int git_diff_delta__cmp(const void *a, const void *b);
 extern int git_diff_delta__casecmp(const void *a, const void *b);
@@ -61,4 +65,3 @@ extern int git_diff__entry_cmp(const void *a, const void *b);
 extern int git_diff__entry_icmp(const void *a, const void *b);
 
 #endif
-