New upstream version 1.4.3+dfsg.1

[libgit2.git] / src / diff.h

diff --git a/src/diff.h b/src/diff.h
index 6ef03ee7cdc98946c2eb1262346dcb12edfe471e..2cc35e65b7c74864ae9839323c39863f3be0e8d2 100644 (file)
--- a/src/diff.h
+++ b/src/diff.h
@@ -7,104 +7,61 @@
 #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"
+#include "odb.h"
 
 #define DIFF_OLD_PREFIX_DEFAULT "a/"
 #define DIFF_NEW_PREFIX_DEFAULT "b/"
 
-enum {
-       GIT_DIFFCAPS_HAS_SYMLINKS     = (1 << 0), /* symlinks on platform? */
-       GIT_DIFFCAPS_ASSUME_UNCHANGED = (1 << 1), /* use stat? */
-       GIT_DIFFCAPS_TRUST_MODE_BITS  = (1 << 2), /* use st_mode? */
-       GIT_DIFFCAPS_TRUST_CTIME      = (1 << 3), /* use st_ctime? */
-       GIT_DIFFCAPS_USE_DEV          = (1 << 4), /* use st_dev? */
-       GIT_DIFFCAPS_TRUST_NANOSECS   = (1 << 5), /* use stat time nanoseconds */
-};
-
-#define DIFF_FLAGS_KNOWN_BINARY (GIT_DIFF_FLAG_BINARY|GIT_DIFF_FLAG_NOT_BINARY)
-#define DIFF_FLAGS_NOT_BINARY   (GIT_DIFF_FLAG_NOT_BINARY|GIT_DIFF_FLAG__NO_DATA)
+typedef enum {
+       GIT_DIFF_TYPE_UNKNOWN = 0,
+       GIT_DIFF_TYPE_GENERATED = 1,
+       GIT_DIFF_TYPE_PARSED = 2
+} git_diff_origin_t;
 
-enum {
-       GIT_DIFF_FLAG__FREE_PATH  = (1 << 7),  /* `path` is allocated memory */
-       GIT_DIFF_FLAG__FREE_DATA  = (1 << 8),  /* internal file data is allocated */
-       GIT_DIFF_FLAG__UNMAP_DATA = (1 << 9),  /* internal file data is mmap'ed */
-       GIT_DIFF_FLAG__NO_DATA    = (1 << 10), /* file data should not be loaded */
-       GIT_DIFF_FLAG__FREE_BLOB  = (1 << 11), /* release the blob when done */
-       GIT_DIFF_FLAG__LOADED     = (1 << 12), /* file data has been loaded */
-
-       GIT_DIFF_FLAG__TO_DELETE  = (1 << 16), /* delete entry during rename det. */
-       GIT_DIFF_FLAG__TO_SPLIT   = (1 << 17), /* split entry during rename det. */
-       GIT_DIFF_FLAG__IS_RENAME_TARGET = (1 << 18),
-       GIT_DIFF_FLAG__IS_RENAME_SOURCE = (1 << 19),
-       GIT_DIFF_FLAG__HAS_SELF_SIMILARITY = (1 << 20),
-};
-
-#define GIT_DIFF_FLAG__CLEAR_INTERNAL(F) (F) = ((F) & 0x00FFFF)
-
-#define GIT_DIFF__VERBOSE  (1 << 30)
-
-struct git_diff_list {
+struct git_diff {
        git_refcount     rc;
        git_repository   *repo;
+       git_attr_session attrsession;
+       git_diff_origin_t type;
        git_diff_options opts;
-       git_vector       pathspec;
        git_vector       deltas;    /* vector of git_diff_delta */
        git_pool pool;
-       git_iterator_type_t old_src;
-       git_iterator_type_t new_src;
-       uint32_t diffcaps;
+       git_iterator_t old_src;
+       git_iterator_t new_src;
+       git_diff_perfdata perf;
 
        int (*strcomp)(const char *, const char *);
        int (*strncomp)(const char *, const char *, size_t);
        int (*pfxcomp)(const char *str, const char *pfx);
        int (*entrycomp)(const void *a, const void *b);
-};
 
-extern void git_diff__cleanup_modes(
-       uint32_t diffcaps, uint32_t *omode, uint32_t *nmode);
+       int (*patch_fn)(git_patch **out, git_diff *diff, size_t idx);
+       void (*free_fn)(git_diff *diff);
+};
 
-extern void git_diff_list_addref(git_diff_list *diff);
+extern int git_diff_delta__format_file_header(
+       git_str *out,
+       const git_diff_delta *delta,
+       const char *oldpfx,
+       const char *newpfx,
+       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);
 
-extern bool git_diff_delta__should_skip(
-       const git_diff_options *opts, const git_diff_delta *delta);
-
-extern int git_diff__oid_for_file(
-       git_repository *, const char *, uint16_t, git_off_t, git_oid *);
-
-extern int git_diff__from_iterators(
-       git_diff_list **diff_ptr,
-       git_repository *repo,
-       git_iterator *old_iter,
-       git_iterator *new_iter,
-       const git_diff_options *opts);
-
-extern int git_diff__paired_foreach(
-       git_diff_list *idx2head,
-       git_diff_list *wd2idx,
-       int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload),
-       void *payload);
-
-extern int git_diff_find_similar__hashsig_for_file(
-       void **out, const git_diff_file *f, const char *path, void *p);
-
-extern int git_diff_find_similar__hashsig_for_buf(
-       void **out, const git_diff_file *f, const char *buf, size_t len, void *p);
-
-extern void git_diff_find_similar__hashsig_free(void *sig, void *payload);
-
-extern int git_diff_find_similar__calc_similarity(
-       int *score, void *siga, void *sigb, void *payload);
+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
-