diffcore.h: drop extern from function declaration
[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"
64acde94 8#include "pathspec.h"
1ff57c13 9#include "object.h"
15af58c1 10#include "oidset.h"
50f9a858 11
91539833 12struct rev_info;
ac1b3d12 13struct diff_options;
04245581 14struct diff_queue_struct;
a3c158d4 15struct strbuf;
a788d7d5
AB
16struct diff_filespec;
17struct userdiff_driver;
910650d2 18struct oid_array;
82889295 19struct commit;
72441af7
KS
20struct combine_diff_path;
21
22typedef int (*pathchange_fn_t)(struct diff_options *options,
23 struct combine_diff_path *path);
ac1b3d12
LT
24
25typedef void (*change_fn_t)(struct diff_options *options,
26 unsigned old_mode, unsigned new_mode,
94a0097a
BW
27 const struct object_id *old_oid,
28 const struct object_id *new_oid,
29 int old_oid_valid, int new_oid_valid,
e3d42c47
JL
30 const char *fullpath,
31 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
ac1b3d12
LT
32
33typedef void (*add_remove_fn_t)(struct diff_options *options,
34 int addremove, unsigned mode,
c26022ea
BW
35 const struct object_id *oid,
36 int oid_valid,
e3d42c47 37 const char *fullpath, unsigned dirty_submodule);
ac1b3d12 38
04245581
JK
39typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
40 struct diff_options *options, void *data);
41
a3c158d4
BY
42typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
43
c6744349
TH
44#define DIFF_FORMAT_RAW 0x0001
45#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
46#define DIFF_FORMAT_NUMSTAT 0x0004
47#define DIFF_FORMAT_SUMMARY 0x0008
48#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 49#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019 50#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349
TH
51
52/* These override all above */
74e2abe5
JH
53#define DIFF_FORMAT_NAME 0x0100
54#define DIFF_FORMAT_NAME_STATUS 0x0200
55#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
56
57/* Same as output_format = 0 but we know that -s flag was given
58 * and we should not give default value to output_format.
59 */
74e2abe5 60#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 61
74e2abe5 62#define DIFF_FORMAT_CALLBACK 0x1000
04245581 63
02f2f56b
BW
64#define DIFF_FLAGS_INIT { 0 }
65struct diff_flags {
0d1e0e78
BW
66 unsigned recursive:1;
67 unsigned tree_in_recursive:1;
68 unsigned binary:1;
69 unsigned text:1;
70 unsigned full_index:1;
71 unsigned silent_on_remove:1;
72 unsigned find_copies_harder:1;
73 unsigned follow_renames:1;
74 unsigned rename_empty:1;
75 unsigned has_changes:1;
76 unsigned quick:1;
77 unsigned no_index:1;
78 unsigned allow_external:1;
79 unsigned exit_with_status:1;
80 unsigned reverse_diff:1;
81 unsigned check_failed:1;
82 unsigned relative_name:1;
83 unsigned ignore_submodules:1;
84 unsigned dirstat_cumulative:1;
85 unsigned dirstat_by_file:1;
86 unsigned allow_textconv:1;
87 unsigned textconv_set_via_cmdline:1;
88 unsigned diff_from_contents:1;
89 unsigned dirty_submodules:1;
90 unsigned ignore_untracked_in_submodules:1;
91 unsigned ignore_dirty_submodules:1;
92 unsigned override_submodule_config:1;
93 unsigned dirstat_by_line:1;
94 unsigned funccontext:1;
0d1e0e78 95 unsigned default_follow_renames:1;
ddf88fa6 96 unsigned stat_with_summary:1;
02f2f56b
BW
97};
98
99static inline void diff_flags_or(struct diff_flags *a,
100 const struct diff_flags *b)
101{
102 char *tmp_a = (char *)a;
103 const char *tmp_b = (const char *)b;
104 int i;
105
106 for (i = 0; i < sizeof(struct diff_flags); i++)
107 tmp_a[i] |= tmp_b[i];
108}
109
628d5c2b
KC
110#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
111#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
112#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae 113
307ab20b
JH
114#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
115
882749a0
TR
116enum diff_words_type {
117 DIFF_WORDS_NONE = 0,
118 DIFF_WORDS_PORCELAIN,
119 DIFF_WORDS_PLAIN,
120 DIFF_WORDS_COLOR
121};
122
61cfbc05
JK
123enum diff_submodule_format {
124 DIFF_SUBMODULE_SHORT = 0,
fd47ae6a
JK
125 DIFF_SUBMODULE_LOG,
126 DIFF_SUBMODULE_INLINE_DIFF
61cfbc05
JK
127};
128
6b5ee137 129struct diff_options {
6b5ee137
JH
130 const char *orderfile;
131 const char *pickaxe;
2f3f8b21 132 const char *single_follow;
eab9a40b 133 const char *a_prefix, *b_prefix;
660e113c
JK
134 const char *line_prefix;
135 size_t line_prefix_length;
02f2f56b 136 struct diff_flags flags;
1ecc1cbd
JH
137
138 /* diff-filter bits */
139 unsigned int filter;
140
f1c96261 141 int use_color;
ee1e5412 142 int context;
6d0e674a 143 int interhunkcontext;
6b5ee137
JH
144 int break_opt;
145 int detect_rename;
467ddc14 146 int irreversible_delete;
fb13227e 147 int skip_stat_unmatch;
6b5ee137
JH
148 int line_termination;
149 int output_format;
929ed70a 150 unsigned pickaxe_opts;
6b5ee137 151 int rename_score;
8082d8d3 152 int rename_limit;
bf0ab10f 153 int needed_rename_limit;
f31027c9 154 int degraded_cc_to_c;
3ac942d4 155 int show_rename_progress;
712d2c7d 156 int dirstat_permille;
6b5ee137 157 int setup;
47dd0d59 158 int abbrev;
425a28e0 159 int ita_invisible_in_index;
b8767f79 160/* white-space error highlighting */
091f8e28
SB
161#define WSEH_NEW (1<<12)
162#define WSEH_CONTEXT (1<<13)
163#define WSEH_OLD (1<<14)
b8767f79 164 unsigned ws_error_highlight;
cd676a51
JH
165 const char *prefix;
166 int prefix_length;
698ce6f8 167 const char *stat_sep;
0d21efa5 168 long xdl_opts;
ac1b3d12 169
2477ab2e
JT
170 /* see Documentation/diff-options.txt */
171 char **anchors;
172 size_t anchors_nr, anchors_alloc;
173
a2540023
JH
174 int stat_width;
175 int stat_name_width;
969fe57b 176 int stat_graph_width;
808e1db2 177 int stat_count;
2b6a5417 178 const char *word_regex;
882749a0 179 enum diff_words_type word_diff;
61cfbc05 180 enum diff_submodule_format submodule_format;
a2540023 181
15af58c1
SB
182 struct oidset *objfind;
183
34a5e1a2
JS
184 /* this is set by diffcore for DIFF_FORMAT_PATCH */
185 int found_changes;
186
44c48a90
JH
187 /* to support internal diff recursion by --follow hack*/
188 int found_follow;
189
6c374008
JH
190 void (*set_default)(struct diff_options *);
191
c0c77734
DB
192 FILE *file;
193 int close_file;
194
66f13625 195 struct pathspec pathspec;
72441af7 196 pathchange_fn_t pathchange;
ac1b3d12
LT
197 change_fn_t change;
198 add_remove_fn_t add_remove;
a937b37e 199 void *change_fn_data;
04245581
JK
200 diff_format_fn_t format_callback;
201 void *format_callback_data;
a3c158d4
BY
202 diff_prefix_fn_t output_prefix;
203 void *output_prefix_data;
ee7fb0b1
ZK
204
205 int diff_path_counter;
e6e045f8
SB
206
207 struct emitted_diff_symbols *emitted_symbols;
2e2d5ac1
SB
208 enum {
209 COLOR_MOVED_NO = 0,
176841f0 210 COLOR_MOVED_PLAIN = 1,
51da15eb
SB
211 COLOR_MOVED_BLOCKS = 2,
212 COLOR_MOVED_ZEBRA = 3,
213 COLOR_MOVED_ZEBRA_DIM = 4,
2e2d5ac1
SB
214 } color_moved;
215 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
f0b8fb6e 216 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
ca1f4ae4
SB
217
218 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
219 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
b3095712 220 int color_moved_ws_handling;
6b5ee137
JH
221};
222
f3597138
SB
223void diff_emit_submodule_del(struct diff_options *o, const char *line);
224void diff_emit_submodule_add(struct diff_options *o, const char *line);
225void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
226void diff_emit_submodule_modified(struct diff_options *o, const char *path);
227void diff_emit_submodule_header(struct diff_options *o, const char *header);
228void diff_emit_submodule_error(struct diff_options *o, const char *err);
229void diff_emit_submodule_pipethrough(struct diff_options *o,
230 const char *line, int len);
231
ce436973
JK
232enum color_diff {
233 DIFF_RESET = 0,
8dbf3eb6 234 DIFF_CONTEXT = 1,
ce436973
JK
235 DIFF_METAINFO = 2,
236 DIFF_FRAGINFO = 3,
237 DIFF_FILE_OLD = 4,
238 DIFF_FILE_NEW = 5,
239 DIFF_COMMIT = 6,
448c3ef1 240 DIFF_WHITESPACE = 7,
2e2d5ac1
SB
241 DIFF_FUNCINFO = 8,
242 DIFF_FILE_OLD_MOVED = 9,
243 DIFF_FILE_OLD_MOVED_ALT = 10,
86b452e2
SB
244 DIFF_FILE_OLD_MOVED_DIM = 11,
245 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
246 DIFF_FILE_NEW_MOVED = 13,
247 DIFF_FILE_NEW_MOVED_ALT = 14,
248 DIFF_FILE_NEW_MOVED_DIM = 15,
249 DIFF_FILE_NEW_MOVED_ALT_DIM = 16
ce436973
JK
250};
251const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae 252#define diff_get_color_opt(o, ix) \
f1c96261 253 diff_get_color((o)->use_color, ix)
8f67f8ae 254
ce436973 255
f1922234
JK
256const char *diff_line_prefix(struct diff_options *);
257
258
698ce6f8
JS
259extern const char mime_boundary_leader[];
260
72441af7 261extern struct combine_diff_path *diff_tree_paths(
fda94b41
BW
262 struct combine_diff_path *p, const struct object_id *oid,
263 const struct object_id **parents_oid, int nparent,
72441af7 264 struct strbuf *base, struct diff_options *opt);
66f414f8
BW
265extern int diff_tree_oid(const struct object_id *old_oid,
266 const struct object_id *new_oid,
267 const char *base, struct diff_options *opt);
7b8dea0c
BW
268extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
269 struct diff_options *opt);
ac1b3d12 270
ea726d02
JH
271struct combine_diff_path {
272 struct combine_diff_path *next;
ea726d02 273 char *path;
2454c962 274 unsigned int mode;
1ff57c13 275 struct object_id oid;
2454c962 276 struct combine_diff_parent {
d416df88 277 char status;
2454c962 278 unsigned int mode;
1ff57c13 279 struct object_id oid;
2454c962 280 } parent[FLEX_ARRAY];
ea726d02 281};
2454c962 282#define combine_diff_path_size(n, l) \
5b442c4f
JK
283 st_add4(sizeof(struct combine_diff_path), (l), 1, \
284 st_mult(sizeof(struct combine_diff_parent), (n)))
ea726d02 285
91539833
LT
286extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
287 int dense, struct rev_info *);
ea726d02 288
b9acf54d 289extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
0fe7c1de 290
82889295 291extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
af3feefa 292
a5a818ee
JH
293void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
294
28b9264d
JH
295extern int diff_can_quit_early(struct diff_options *);
296
6b5ee137
JH
297extern void diff_addremove(struct diff_options *,
298 int addremove,
77eb2720 299 unsigned mode,
c26022ea
BW
300 const struct object_id *oid,
301 int oid_valid,
e3d42c47 302 const char *fullpath, unsigned dirty_submodule);
77eb2720 303
6b5ee137
JH
304extern void diff_change(struct diff_options *,
305 unsigned mode1, unsigned mode2,
94a0097a
BW
306 const struct object_id *old_oid,
307 const struct object_id *new_oid,
308 int old_oid_valid, int new_oid_valid,
e3d42c47
JL
309 const char *fullpath,
310 unsigned dirty_submodule1, unsigned dirty_submodule2);
77eb2720 311
fa7b2908 312extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
77eb2720 313
19feebc8 314#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
315#define DIFF_SETUP_USE_CACHE 2
316#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 317
dea007fb 318/*
b0d12fc9 319 * Poor man's alternative to parse-option, to allow both stuck form
dea007fb
MM
320 * (--option=value) and separate form (--option value).
321 */
322extern int parse_long_opt(const char *opt, const char **argv,
323 const char **optarg);
324
ef90d6d4 325extern int git_diff_basic_config(const char *var, const char *value, void *cb);
5b162879 326extern int git_diff_heuristic_config(const char *var, const char *value, void *cb);
5404c116 327extern void init_diff_ui_defaults(void);
ef90d6d4 328extern int git_diff_ui_config(const char *var, const char *value, void *cb);
6b5ee137 329extern void diff_setup(struct diff_options *);
a97262c6 330extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
28452655 331extern void diff_setup_done(struct diff_options *);
85b46030 332extern int git_config_rename(const char *var, const char *value);
86436c28 333
6b14d7fa
JH
334#define DIFF_DETECT_RENAME 1
335#define DIFF_DETECT_COPY 2
336
367cec1c 337#define DIFF_PICKAXE_ALL 1
d01d8c67 338#define DIFF_PICKAXE_REGEX 2
f345b0a0 339
f506b8e8
JH
340#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
341#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
15af58c1 342#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
f506b8e8 343
15af58c1
SB
344#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
345 DIFF_PICKAXE_KIND_G | \
346 DIFF_PICKAXE_KIND_OBJFIND)
cf63051a 347
c1ddc461 348#define DIFF_PICKAXE_IGNORE_CASE 32
f506b8e8 349
6b5ee137 350extern void diffcore_std(struct diff_options *);
730f7284 351extern void diffcore_fix_diff_index(struct diff_options *);
f2ce9fde 352
dda2d79a
JH
353#define COMMON_DIFF_OPTIONS_HELP \
354"\ncommon diff options:\n" \
8082d8d3
JH
355" -z output diff-raw with lines terminated with NUL.\n" \
356" -p output patch format.\n" \
357" -u synonym for -p.\n" \
5c91da25
PB
358" --patch-with-raw\n" \
359" output both a patch and the diff-raw format.\n" \
d75f7952 360" --stat show diffstat instead of patch.\n" \
74e2abe5 361" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
362" --patch-with-stat\n" \
363" output a patch and prepend its diffstat.\n" \
8082d8d3 364" --name-only show only names of changed files.\n" \
946f5f7c 365" --name-status show names and status of changed files.\n" \
47dd0d59 366" --full-index show full object name on index lines.\n" \
913419fc 367" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
368" -R swap input file pairs.\n" \
369" -B detect complete rewrites.\n" \
370" -M detect renames.\n" \
371" -C detect copies.\n" \
dda2d79a 372" --find-copies-harder\n" \
8082d8d3
JH
373" try unchanged files as candidate for copy detection.\n" \
374" -l<n> limit rename attempts up to <n> paths.\n" \
375" -O<file> reorder diffs according to the <file>.\n" \
376" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 377" --pickaxe-all\n" \
ca49920f
SF
378" show all files diff when -S is used and hit is found.\n" \
379" -a --text treat all files as text.\n"
dda2d79a 380
38c6f780 381extern int diff_queue_is_empty(void);
6b5ee137 382extern void diff_flush(struct diff_options*);
f31027c9 383extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
86436c28 384
e7baa4f4 385/* diff-raw status letters */
ca8c9156 386#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
387#define DIFF_STATUS_COPIED 'C'
388#define DIFF_STATUS_DELETED 'D'
389#define DIFF_STATUS_MODIFIED 'M'
390#define DIFF_STATUS_RENAMED 'R'
391#define DIFF_STATUS_TYPE_CHANGED 'T'
392#define DIFF_STATUS_UNKNOWN 'X'
393#define DIFF_STATUS_UNMERGED 'U'
394
395/* these are not diff-raw status letters proper, but used by
396 * diffcore-filter insn to specify additional restrictions.
397 */
0b34379a 398#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
399#define DIFF_STATUS_FILTER_BROKEN 'B'
400
d5e3b01e
JK
401/*
402 * This is different from find_unique_abbrev() in that
403 * it stuffs the result with dots for alignment.
404 */
d6cece51 405extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);
47dd0d59 406
4bd5b7da
JH
407/* do not report anything on removed paths */
408#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
409/* report racily-clean paths as modified */
410#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 411extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e 412extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 413
944cffbd 414extern int do_diff_cache(const struct object_id *, struct diff_options *);
bd25f288 415extern int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
fcb3d0ad 416
da31b358
JH
417extern int diff_result_code(struct diff_options *, int);
418
e5f7a5d1 419extern void diff_no_index(struct rev_info *, int, const char **);
0569e9b8 420
02f2f56b
BW
421extern int index_differs_from(const char *def, const struct diff_flags *flags,
422 int ita_invisible_in_index);
75f3ff2e 423
a64e6a44
JK
424/*
425 * Fill the contents of the filespec "df", respecting any textconv defined by
426 * its userdiff driver. The "driver" parameter must come from a
427 * previous call to get_textconv(), and therefore should either be NULL or have
428 * textconv enabled.
429 *
430 * Note that the memory ownership of the resulting buffer depends on whether
431 * the driver field is NULL. If it is, then the memory belongs to the filespec
432 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
433 * that should be freed by the caller.
434 */
a788d7d5
AB
435extern size_t fill_textconv(struct userdiff_driver *driver,
436 struct diff_filespec *df,
437 char **outbuf);
438
a64e6a44
JK
439/*
440 * Look up the userdiff driver for the given filespec, and return it if
441 * and only if it has textconv enabled (otherwise return NULL). The result
442 * can be passed to fill_textconv().
443 */
a788d7d5
AB
444extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
445
3a35cb2e
JS
446/*
447 * Prepare diff_filespec and convert it using diff textconv API
448 * if the textconv driver exists.
449 * Return 1 if the conversion succeeds, 0 otherwise.
450 */
451extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);
452
10ae7526
KB
453extern int parse_rename_score(const char **cp_p);
454
07924d4d
MP
455extern long parse_algorithm_value(const char *value);
456
0911c475
SB
457extern void print_stat_summary(FILE *fp, int files,
458 int insertions, int deletions);
4914c962 459extern void setup_diff_pager(struct diff_options *);
7f814632 460
86436c28 461#endif /* DIFF_H */