Provide git_config with a callback-data parameter
[git/git.git] / diff.h
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c28
JH
4#ifndef DIFF_H
5#define DIFF_H
6
1b0c7174 7#include "tree-walk.h"
50f9a858 8
91539833 9struct rev_info;
ac1b3d12 10struct diff_options;
04245581 11struct diff_queue_struct;
ac1b3d12
LT
12
13typedef void (*change_fn_t)(struct diff_options *options,
14 unsigned old_mode, unsigned new_mode,
15 const unsigned char *old_sha1,
16 const unsigned char *new_sha1,
17 const char *base, const char *path);
18
19typedef void (*add_remove_fn_t)(struct diff_options *options,
20 int addremove, unsigned mode,
21 const unsigned char *sha1,
22 const char *base, const char *path);
23
04245581
JK
24typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
c6744349
TH
27#define DIFF_FORMAT_RAW 0x0001
28#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
29#define DIFF_FORMAT_NUMSTAT 0x0004
30#define DIFF_FORMAT_SUMMARY 0x0008
31#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 32#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019
LT
33#define DIFF_FORMAT_DIRSTAT 0x0040
34#define DIFF_FORMAT_CUMULATIVE 0x0080
c6744349
TH
35
36/* These override all above */
74e2abe5
JH
37#define DIFF_FORMAT_NAME 0x0100
38#define DIFF_FORMAT_NAME_STATUS 0x0200
39#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
40
41/* Same as output_format = 0 but we know that -s flag was given
42 * and we should not give default value to output_format.
43 */
74e2abe5 44#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 45
74e2abe5 46#define DIFF_FORMAT_CALLBACK 0x1000
04245581 47
8f67f8ae
PH
48#define DIFF_OPT_RECURSIVE (1 << 0)
49#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
50#define DIFF_OPT_BINARY (1 << 2)
51#define DIFF_OPT_TEXT (1 << 3)
52#define DIFF_OPT_FULL_INDEX (1 << 4)
53#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
54#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
55#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
56#define DIFF_OPT_COLOR_DIFF (1 << 8)
57#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
58#define DIFF_OPT_HAS_CHANGES (1 << 10)
59#define DIFF_OPT_QUIET (1 << 11)
60#define DIFF_OPT_NO_INDEX (1 << 12)
61#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
62#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
63#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895 64#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51 65#define DIFF_OPT_RELATIVE_NAME (1 << 17)
8f67f8ae
PH
66#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
67#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
68#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
69
6b5ee137 70struct diff_options {
6b5ee137
JH
71 const char *filter;
72 const char *orderfile;
73 const char *pickaxe;
2f3f8b21 74 const char *single_follow;
eab9a40b 75 const char *a_prefix, *b_prefix;
8f67f8ae 76 unsigned flags;
ee1e5412 77 int context;
6b5ee137
JH
78 int break_opt;
79 int detect_rename;
fb13227e 80 int skip_stat_unmatch;
6b5ee137
JH
81 int line_termination;
82 int output_format;
83 int pickaxe_opts;
84 int rename_score;
8082d8d3 85 int rename_limit;
7df7c019 86 int dirstat_percent;
6b5ee137 87 int setup;
47dd0d59 88 int abbrev;
cd676a51
JH
89 const char *prefix;
90 int prefix_length;
698ce6f8 91 const char *stat_sep;
0d21efa5 92 long xdl_opts;
ac1b3d12 93
a2540023
JH
94 int stat_width;
95 int stat_name_width;
96
34a5e1a2
JS
97 /* this is set by diffcore for DIFF_FORMAT_PATCH */
98 int found_changes;
99
c0c77734
DB
100 FILE *file;
101 int close_file;
102
a8baa7b9
JH
103 int nr_paths;
104 const char **paths;
105 int *pathlens;
ac1b3d12
LT
106 change_fn_t change;
107 add_remove_fn_t add_remove;
04245581
JK
108 diff_format_fn_t format_callback;
109 void *format_callback_data;
6b5ee137
JH
110};
111
ce436973
JK
112enum color_diff {
113 DIFF_RESET = 0,
114 DIFF_PLAIN = 1,
115 DIFF_METAINFO = 2,
116 DIFF_FRAGINFO = 3,
117 DIFF_FILE_OLD = 4,
118 DIFF_FILE_NEW = 5,
119 DIFF_COMMIT = 6,
448c3ef1 120 DIFF_WHITESPACE = 7,
ce436973
JK
121};
122const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae
PH
123#define diff_get_color_opt(o, ix) \
124 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
125
ce436973 126
698ce6f8
JS
127extern const char mime_boundary_leader[];
128
a8baa7b9
JH
129extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
130extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
131extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
132 const char *base, struct diff_options *opt);
133extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
134 const char *base, struct diff_options *opt);
2b60356d
RS
135extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
136 struct diff_options *opt);
ac1b3d12 137
ea726d02
JH
138struct combine_diff_path {
139 struct combine_diff_path *next;
140 int len;
141 char *path;
2454c962 142 unsigned int mode;
ea726d02 143 unsigned char sha1[20];
2454c962 144 struct combine_diff_parent {
d416df88 145 char status;
2454c962
JH
146 unsigned int mode;
147 unsigned char sha1[20];
148 } parent[FLEX_ARRAY];
ea726d02 149};
2454c962
JH
150#define combine_diff_path_size(n, l) \
151 (sizeof(struct combine_diff_path) + \
152 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 153
91539833
LT
154extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
155 int dense, struct rev_info *);
ea726d02 156
0fe7c1de
JH
157extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
158
91539833 159extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
af3feefa 160
6b5ee137
JH
161extern void diff_addremove(struct diff_options *,
162 int addremove,
77eb2720
JH
163 unsigned mode,
164 const unsigned char *sha1,
165 const char *base,
166 const char *path);
167
6b5ee137
JH
168extern void diff_change(struct diff_options *,
169 unsigned mode1, unsigned mode2,
170 const unsigned char *sha1,
171 const unsigned char *sha2,
172 const char *base, const char *path);
77eb2720 173
6b5ee137 174extern void diff_unmerge(struct diff_options *,
e9c84099
JH
175 const char *path,
176 unsigned mode,
177 const unsigned char *sha1);
77eb2720 178
19feebc8 179#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
180#define DIFF_SETUP_USE_CACHE 2
181#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 182
ef90d6d4
JS
183extern int git_diff_basic_config(const char *var, const char *value, void *cb);
184extern int git_diff_ui_config(const char *var, const char *value, void *cb);
6b2f2d98 185extern int diff_use_color_default;
6b5ee137
JH
186extern void diff_setup(struct diff_options *);
187extern int diff_opt_parse(struct diff_options *, const char **, int);
188extern int diff_setup_done(struct diff_options *);
86436c28 189
6b14d7fa
JH
190#define DIFF_DETECT_RENAME 1
191#define DIFF_DETECT_COPY 2
192
367cec1c 193#define DIFF_PICKAXE_ALL 1
d01d8c67 194#define DIFF_PICKAXE_REGEX 2
f345b0a0 195
6b5ee137 196extern void diffcore_std(struct diff_options *);
f2ce9fde 197
dda2d79a
JH
198#define COMMON_DIFF_OPTIONS_HELP \
199"\ncommon diff options:\n" \
8082d8d3
JH
200" -z output diff-raw with lines terminated with NUL.\n" \
201" -p output patch format.\n" \
202" -u synonym for -p.\n" \
5c91da25
PB
203" --patch-with-raw\n" \
204" output both a patch and the diff-raw format.\n" \
d75f7952 205" --stat show diffstat instead of patch.\n" \
74e2abe5 206" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
207" --patch-with-stat\n" \
208" output a patch and prepend its diffstat.\n" \
8082d8d3 209" --name-only show only names of changed files.\n" \
946f5f7c 210" --name-status show names and status of changed files.\n" \
47dd0d59 211" --full-index show full object name on index lines.\n" \
913419fc 212" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
213" -R swap input file pairs.\n" \
214" -B detect complete rewrites.\n" \
215" -M detect renames.\n" \
216" -C detect copies.\n" \
dda2d79a 217" --find-copies-harder\n" \
8082d8d3
JH
218" try unchanged files as candidate for copy detection.\n" \
219" -l<n> limit rename attempts up to <n> paths.\n" \
220" -O<file> reorder diffs according to the <file>.\n" \
221" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 222" --pickaxe-all\n" \
ca49920f
SF
223" show all files diff when -S is used and hit is found.\n" \
224" -a --text treat all files as text.\n"
dda2d79a 225
38c6f780 226extern int diff_queue_is_empty(void);
6b5ee137 227extern void diff_flush(struct diff_options*);
86436c28 228
e7baa4f4 229/* diff-raw status letters */
ca8c9156 230#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
231#define DIFF_STATUS_COPIED 'C'
232#define DIFF_STATUS_DELETED 'D'
233#define DIFF_STATUS_MODIFIED 'M'
234#define DIFF_STATUS_RENAMED 'R'
235#define DIFF_STATUS_TYPE_CHANGED 'T'
236#define DIFF_STATUS_UNKNOWN 'X'
237#define DIFF_STATUS_UNMERGED 'U'
238
239/* these are not diff-raw status letters proper, but used by
240 * diffcore-filter insn to specify additional restrictions.
241 */
0b34379a 242#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
243#define DIFF_STATUS_FILTER_BROKEN 'B'
244
47dd0d59
JH
245extern const char *diff_unique_abbrev(const unsigned char *, int);
246
4bd5b7da
JH
247/* do not report anything on removed paths */
248#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
249/* report racily-clean paths as modified */
250#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 251extern int run_diff_files(struct rev_info *revs, unsigned int option);
fcfa33ec
JS
252extern int setup_diff_no_index(struct rev_info *revs,
253 int argc, const char ** argv, int nongit, const char *prefix);
d516c2d1 254extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
6973dcae 255
5c21ac0e 256extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 257
1cfe7733 258extern int do_diff_cache(const unsigned char *, struct diff_options *);
fcb3d0ad
JS
259extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
260
da31b358
JH
261extern int diff_result_code(struct diff_options *, int);
262
86436c28 263#endif /* DIFF_H */