Split up git-pull-script into separate "fetch" and "merge" phases.
[git/fastimport.git] / diffcore.h
blobd087e1758c308fcf761840800a9bd7c00dc17dfc
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef _DIFFCORE_H_
5 #define _DIFFCORE_H_
7 /* This header file is internal between diff.c and its diff transformers
8 * (e.g. diffcore-rename, diffcore-pickaxe). Never include this header
9 * in anything else.
11 #define MAX_SCORE 10000
12 #define DEFAULT_MINIMUM_SCORE 5000
14 #define RENAME_DST_MATCHED 01
15 #define RENAME_SRC_GONE 02
16 #define RENAME_SCORE_SHIFT 8
18 struct diff_filespec {
19 unsigned char sha1[20];
20 char *path;
21 void *data;
22 unsigned long size;
23 int xfrm_flags; /* for use by the xfrm */
24 unsigned short mode; /* file mode */
25 unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
26 * if false, use the name and read from
27 * the filesystem.
29 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
30 unsigned should_free : 1; /* data should be free()'ed */
31 unsigned should_munmap : 1; /* data should be munmap()'ed */
34 extern struct diff_filespec *alloc_filespec(const char *);
35 extern void fill_filespec(struct diff_filespec *, const unsigned char *,
36 unsigned short);
38 extern int diff_populate_filespec(struct diff_filespec *);
39 extern void diff_free_filespec_data(struct diff_filespec *);
41 struct diff_filepair {
42 struct diff_filespec *one;
43 struct diff_filespec *two;
44 char *xfrm_msg;
45 int orig_order; /* the original order of insertion into the queue */
46 int xfrm_work; /* for use by tramsformers, not by diffcore */
48 #define DIFF_PAIR_UNMERGED(p) \
49 (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
51 struct diff_queue_struct {
52 struct diff_filepair **queue;
53 int alloc;
54 int nr;
57 extern struct diff_queue_struct diff_queued_diff;
58 extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
59 struct diff_filespec *,
60 struct diff_filespec *);
61 extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
62 extern void diff_free_filepair(struct diff_filepair *);
64 #endif