]> git.ipfire.org Git - thirdparty/git.git/blame - diff.h
preload-index.h: move declarations for preload-index.c from elsewhere
[thirdparty/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
64acde94 7#include "pathspec.h"
15af58c1 8#include "oidset.h"
a64215b6 9#include "strbuf.h"
50f9a858 10
13c4d7eb
HW
11/**
12 * The diff API is for programs that compare two sets of files (e.g. two trees,
13 * one tree and the index) and present the found difference in various ways.
14 * The calling program is responsible for feeding the API pairs of files, one
15 * from the "old" set and the corresponding one from "new" set, that are
16 * different.
17 * The library called through this API is called diffcore, and is responsible
18 * for two things.
19 *
20 * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
21 * changes that touch a string (`-S`), as specified by the caller.
22 *
23 * - outputting the differences in various formats, as specified by the caller.
24 *
25 * Calling sequence
26 * ----------------
27 *
28 * - Prepare `struct diff_options` to record the set of diff options, and then
29 * call `repo_diff_setup()` to initialize this structure. This sets up the
30 * vanilla default.
31 *
32 * - Fill in the options structure to specify desired output format, rename
33 * detection, etc. `diff_opt_parse()` can be used to parse options given
34 * from the command line in a way consistent with existing git-diff family
35 * of programs.
36 *
37 * - Call `diff_setup_done()`; this inspects the options set up so far for
38 * internal consistency and make necessary tweaking to it (e.g. if textual
39 * patch output was asked, recursive behaviour is turned on); the callback
40 * set_default in diff_options can be used to tweak this more.
41 *
42 * - As you find different pairs of files, call `diff_change()` to feed
43 * modified files, `diff_addremove()` to feed created or deleted files, or
44 * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API.
45 * These are thin wrappers to a lower-level `diff_queue()` function that is
46 * flexible enough to record any of these kinds of changes.
47 *
48 * - Once you finish feeding the pairs of files, call `diffcore_std()`.
49 * This will tell the diffcore library to go ahead and do its work.
50 *
e900d494
ÆAB
51 * - Calling `diff_flush()` will produce the output, it will call
52 * `diff_free()` to free any resources, e.g. those allocated in
53 * `diff_opt_parse()`.
54 *
55 * - Set `.no_free = 1` before calling `diff_flush()` to defer the
56 * freeing of allocated memory in diff_options. This is useful when
57 * `diff_flush()` is being called in a loop, rather than as a
58 * one-off. When setting `.no_free = 1` you must ensure that
59 * `diff_free()` is called at the end, either by flipping the flag
60 * before the last `diff_flush()` call, or by flipping it before
61 * calling `diff_free()` yourself.
13c4d7eb
HW
62 */
63
4a1b13a3
NTND
64struct combine_diff_path;
65struct commit;
66struct diff_filespec;
ac1b3d12 67struct diff_options;
04245581 68struct diff_queue_struct;
910650d2 69struct oid_array;
4a288478 70struct option;
b78ea5fc 71struct repository;
4a1b13a3 72struct rev_info;
4a1b13a3 73struct userdiff_driver;
72441af7
KS
74
75typedef int (*pathchange_fn_t)(struct diff_options *options,
76 struct combine_diff_path *path);
ac1b3d12
LT
77
78typedef void (*change_fn_t)(struct diff_options *options,
79 unsigned old_mode, unsigned new_mode,
94a0097a
BW
80 const struct object_id *old_oid,
81 const struct object_id *new_oid,
82 int old_oid_valid, int new_oid_valid,
e3d42c47
JL
83 const char *fullpath,
84 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
ac1b3d12
LT
85
86typedef void (*add_remove_fn_t)(struct diff_options *options,
87 int addremove, unsigned mode,
c26022ea
BW
88 const struct object_id *oid,
89 int oid_valid,
e3d42c47 90 const char *fullpath, unsigned dirty_submodule);
ac1b3d12 91
04245581
JK
92typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
93 struct diff_options *options, void *data);
94
a3c158d4
BY
95typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
96
c6744349
TH
97#define DIFF_FORMAT_RAW 0x0001
98#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
99#define DIFF_FORMAT_NUMSTAT 0x0004
100#define DIFF_FORMAT_SUMMARY 0x0008
101#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 102#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019 103#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349
TH
104
105/* These override all above */
74e2abe5
JH
106#define DIFF_FORMAT_NAME 0x0100
107#define DIFF_FORMAT_NAME_STATUS 0x0200
108#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
109
110/* Same as output_format = 0 but we know that -s flag was given
111 * and we should not give default value to output_format.
112 */
74e2abe5 113#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 114
74e2abe5 115#define DIFF_FORMAT_CALLBACK 0x1000
04245581 116
02f2f56b
BW
117#define DIFF_FLAGS_INIT { 0 }
118struct diff_flags {
13c4d7eb
HW
119
120 /**
121 * Tells if tree traversal done by tree-diff should recursively descend
122 * into a tree object pair that are different in preimage and postimage set.
123 */
2b393ef3
NTND
124 unsigned recursive;
125 unsigned tree_in_recursive;
13c4d7eb
HW
126
127 /* Affects the way how a file that is seemingly binary is treated. */
2b393ef3
NTND
128 unsigned binary;
129 unsigned text;
13c4d7eb
HW
130
131 /**
132 * Tells the patch output format not to use abbreviated object names on the
133 * "index" lines.
134 */
2b393ef3 135 unsigned full_index;
13c4d7eb
HW
136
137 /* Affects if diff-files shows removed files. */
2b393ef3 138 unsigned silent_on_remove;
13c4d7eb
HW
139
140 /**
141 * Tells the diffcore library that the caller is feeding unchanged
142 * filepairs to allow copies from unmodified files be detected.
143 */
2b393ef3 144 unsigned find_copies_harder;
13c4d7eb 145
2b393ef3
NTND
146 unsigned follow_renames;
147 unsigned rename_empty;
13c4d7eb
HW
148
149 /* Internal; used for optimization to see if there is any change. */
2b393ef3 150 unsigned has_changes;
13c4d7eb 151
2b393ef3 152 unsigned quick;
13c4d7eb
HW
153
154 /**
155 * Tells diff-files that the input is not tracked files but files in random
156 * locations on the filesystem.
157 */
2b393ef3 158 unsigned no_index;
13c4d7eb
HW
159
160 /**
161 * Tells output routine that it is Ok to call user specified patch output
162 * routine. Plumbing disables this to ensure stable output.
163 */
2b393ef3 164 unsigned allow_external;
13c4d7eb
HW
165
166 /**
167 * For communication between the calling program and the options parser;
168 * tell the calling program to signal the presence of difference using
169 * program exit code.
170 */
2b393ef3 171 unsigned exit_with_status;
13c4d7eb
HW
172
173 /**
174 * Tells the library that the calling program is feeding the filepairs
175 * reversed; `one` is two, and `two` is one.
176 */
2b393ef3 177 unsigned reverse_diff;
13c4d7eb 178
2b393ef3
NTND
179 unsigned check_failed;
180 unsigned relative_name;
181 unsigned ignore_submodules;
182 unsigned dirstat_cumulative;
183 unsigned dirstat_by_file;
184 unsigned allow_textconv;
185 unsigned textconv_set_via_cmdline;
186 unsigned diff_from_contents;
187 unsigned dirty_submodules;
188 unsigned ignore_untracked_in_submodules;
8ef93124 189 unsigned ignore_submodule_set;
2b393ef3
NTND
190 unsigned ignore_dirty_submodules;
191 unsigned override_submodule_config;
192 unsigned dirstat_by_line;
193 unsigned funccontext;
194 unsigned default_follow_renames;
195 unsigned stat_with_summary;
196 unsigned suppress_diff_headers;
197 unsigned dual_color_diffed_diffs;
430be36e 198 unsigned suppress_hunk_header_line_count;
02f2f56b
BW
199};
200
201static inline void diff_flags_or(struct diff_flags *a,
202 const struct diff_flags *b)
203{
204 char *tmp_a = (char *)a;
205 const char *tmp_b = (const char *)b;
206 int i;
207
208 for (i = 0; i < sizeof(struct diff_flags); i++)
209 tmp_a[i] |= tmp_b[i];
210}
211
628d5c2b
KC
212#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
213#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
214#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae 215
307ab20b
JH
216#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
217
882749a0
TR
218enum diff_words_type {
219 DIFF_WORDS_NONE = 0,
220 DIFF_WORDS_PORCELAIN,
221 DIFF_WORDS_PLAIN,
222 DIFF_WORDS_COLOR
223};
224
61cfbc05
JK
225enum diff_submodule_format {
226 DIFF_SUBMODULE_SHORT = 0,
fd47ae6a
JK
227 DIFF_SUBMODULE_LOG,
228 DIFF_SUBMODULE_INLINE_DIFF
61cfbc05
JK
229};
230
13c4d7eb
HW
231/**
232 * the set of options the calling program wants to affect the operation of
233 * diffcore library with.
234 */
6b5ee137 235struct diff_options {
6b5ee137 236 const char *orderfile;
13c4d7eb 237
1eb4136a
JH
238 /*
239 * "--rotate-to=<file>" would start showing at <file> and when
240 * the output reaches the end, wrap around by default.
241 * Setting skip_instead_of_rotate to true stops the output at the
242 * end, effectively discarding the earlier part of the output
243 * before <file>'s diff (this is used to implement the
244 * "--skip-to=<file>" option).
245 *
246 * When rotate_to_strict is set, it is an error if there is no
247 * <file> in the diff. Otherwise, the output starts at the
248 * path that is the same as, or first path that sorts after,
249 * <file>. Because it is unreasonable to require the exact
250 * match for "git log -p --rotate-to=<file>" (i.e. not all
251 * commit would touch that single <file>), "git log" sets it
252 * to false. "git diff" sets it to true to detect an error
253 * in the command line option.
254 */
255 const char *rotate_to;
256 int skip_instead_of_rotate;
257 int rotate_to_strict;
258
13c4d7eb
HW
259 /**
260 * A constant string (can and typically does contain newlines to look for
261 * a block of text, not just a single line) to filter out the filepairs
262 * that do not change the number of strings contained in its preimage and
263 * postimage of the diff_queue.
264 */
6b5ee137 265 const char *pickaxe;
a47fcbe6 266 unsigned pickaxe_opts;
13c4d7eb 267
296d4a94
MK
268 /* -I<regex> */
269 regex_t **ignore_regex;
270 size_t ignore_regex_nr, ignore_regex_alloc;
271
2f3f8b21 272 const char *single_follow;
eab9a40b 273 const char *a_prefix, *b_prefix;
660e113c
JK
274 const char *line_prefix;
275 size_t line_prefix_length;
13c4d7eb
HW
276
277 /**
278 * collection of boolean options that affects the operation, but some do
279 * not have anything to do with the diffcore library.
280 */
02f2f56b 281 struct diff_flags flags;
1ecc1cbd
JH
282
283 /* diff-filter bits */
75408ca9 284 unsigned int filter, filter_not;
1ecc1cbd 285
f1c96261 286 int use_color;
13c4d7eb
HW
287
288 /* Number of context lines to generate in patch output. */
ee1e5412 289 int context;
13c4d7eb 290
6d0e674a 291 int interhunkcontext;
13c4d7eb
HW
292
293 /* Affects the way detection logic for complete rewrites, renames and
294 * copies.
295 */
6b5ee137
JH
296 int break_opt;
297 int detect_rename;
13c4d7eb 298
467ddc14 299 int irreversible_delete;
fb13227e 300 int skip_stat_unmatch;
6b5ee137 301 int line_termination;
13c4d7eb
HW
302
303 /* The output format used when `diff_flush()` is run. */
6b5ee137 304 int output_format;
13c4d7eb 305
13c4d7eb
HW
306 /* Affects the way detection logic for complete rewrites, renames and
307 * copies.
308 */
6b5ee137 309 int rename_score;
8082d8d3 310 int rename_limit;
13c4d7eb 311
bf0ab10f 312 int needed_rename_limit;
f31027c9 313 int degraded_cc_to_c;
3ac942d4 314 int show_rename_progress;
712d2c7d 315 int dirstat_permille;
6b5ee137 316 int setup;
13c4d7eb
HW
317
318 /* Number of hexdigits to abbreviate raw format output to. */
47dd0d59 319 int abbrev;
13c4d7eb 320
e3696980
DS
321 /* If non-zero, then stop computing after this many changes. */
322 int max_changes;
e3696980 323
425a28e0 324 int ita_invisible_in_index;
b8767f79 325/* white-space error highlighting */
091f8e28
SB
326#define WSEH_NEW (1<<12)
327#define WSEH_CONTEXT (1<<13)
328#define WSEH_OLD (1<<14)
b8767f79 329 unsigned ws_error_highlight;
cd676a51
JH
330 const char *prefix;
331 int prefix_length;
698ce6f8 332 const char *stat_sep;
7f125ff9 333 int xdl_opts;
a4cf900e 334 int ignore_driver_algorithm;
ac1b3d12 335
2477ab2e
JT
336 /* see Documentation/diff-options.txt */
337 char **anchors;
338 size_t anchors_nr, anchors_alloc;
339
a2540023
JH
340 int stat_width;
341 int stat_name_width;
969fe57b 342 int stat_graph_width;
808e1db2 343 int stat_count;
2b6a5417 344 const char *word_regex;
882749a0 345 enum diff_words_type word_diff;
61cfbc05 346 enum diff_submodule_format submodule_format;
a2540023 347
15af58c1
SB
348 struct oidset *objfind;
349
34a5e1a2
JS
350 /* this is set by diffcore for DIFF_FORMAT_PATCH */
351 int found_changes;
352
44c48a90
JH
353 /* to support internal diff recursion by --follow hack*/
354 int found_follow;
355
13c4d7eb 356 /* Callback which allows tweaking the options in diff_setup_done(). */
6c374008
JH
357 void (*set_default)(struct diff_options *);
358
c0c77734
DB
359 FILE *file;
360 int close_file;
361
7648b79e
SB
362#define OUTPUT_INDICATOR_NEW 0
363#define OUTPUT_INDICATOR_OLD 1
364#define OUTPUT_INDICATOR_CONTEXT 2
365 char output_indicators[3];
366
66f13625 367 struct pathspec pathspec;
72441af7 368 pathchange_fn_t pathchange;
ac1b3d12
LT
369 change_fn_t change;
370 add_remove_fn_t add_remove;
a937b37e 371 void *change_fn_data;
04245581
JK
372 diff_format_fn_t format_callback;
373 void *format_callback_data;
a3c158d4
BY
374 diff_prefix_fn_t output_prefix;
375 void *output_prefix_data;
ee7fb0b1
ZK
376
377 int diff_path_counter;
e6e045f8
SB
378
379 struct emitted_diff_symbols *emitted_symbols;
2e2d5ac1
SB
380 enum {
381 COLOR_MOVED_NO = 0,
176841f0 382 COLOR_MOVED_PLAIN = 1,
51da15eb
SB
383 COLOR_MOVED_BLOCKS = 2,
384 COLOR_MOVED_ZEBRA = 3,
385 COLOR_MOVED_ZEBRA_DIM = 4,
2e2d5ac1
SB
386 } color_moved;
387 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
f0b8fb6e 388 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
ca1f4ae4
SB
389
390 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
391 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
d173e799
SB
392 #define COLOR_MOVED_WS_ERROR (1<<0)
393 unsigned color_moved_ws_handling;
b78ea5fc
NTND
394
395 struct repository *repo;
95433eee 396 struct strmap *additional_path_headers;
e900d494
ÆAB
397
398 int no_free;
6b5ee137
JH
399};
400
cdb5330a
NTND
401unsigned diff_filter_bit(char status);
402
f3597138
SB
403void diff_emit_submodule_del(struct diff_options *o, const char *line);
404void diff_emit_submodule_add(struct diff_options *o, const char *line);
405void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
406void diff_emit_submodule_modified(struct diff_options *o, const char *path);
407void diff_emit_submodule_header(struct diff_options *o, const char *header);
408void diff_emit_submodule_error(struct diff_options *o, const char *err);
409void diff_emit_submodule_pipethrough(struct diff_options *o,
410 const char *line, int len);
411
e4cb659e
DF
412struct diffstat_t {
413 int nr;
414 int alloc;
415 struct diffstat_file {
416 char *from_name;
417 char *name;
418 char *print_name;
419 const char *comments;
420 unsigned is_unmerged:1;
421 unsigned is_binary:1;
422 unsigned is_renamed:1;
423 unsigned is_interesting:1;
424 uintmax_t added, deleted;
425 } **files;
426};
427
ce436973
JK
428enum color_diff {
429 DIFF_RESET = 0,
8dbf3eb6 430 DIFF_CONTEXT = 1,
ce436973
JK
431 DIFF_METAINFO = 2,
432 DIFF_FRAGINFO = 3,
433 DIFF_FILE_OLD = 4,
434 DIFF_FILE_NEW = 5,
435 DIFF_COMMIT = 6,
448c3ef1 436 DIFF_WHITESPACE = 7,
2e2d5ac1
SB
437 DIFF_FUNCINFO = 8,
438 DIFF_FILE_OLD_MOVED = 9,
439 DIFF_FILE_OLD_MOVED_ALT = 10,
86b452e2
SB
440 DIFF_FILE_OLD_MOVED_DIM = 11,
441 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
442 DIFF_FILE_NEW_MOVED = 13,
443 DIFF_FILE_NEW_MOVED_ALT = 14,
444 DIFF_FILE_NEW_MOVED_DIM = 15,
a7be92ac
JS
445 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
446 DIFF_CONTEXT_DIM = 17,
447 DIFF_FILE_OLD_DIM = 18,
448 DIFF_FILE_NEW_DIM = 19,
449 DIFF_CONTEXT_BOLD = 20,
450 DIFF_FILE_OLD_BOLD = 21,
451 DIFF_FILE_NEW_BOLD = 22,
ce436973 452};
13c4d7eb 453
ce436973 454const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae 455#define diff_get_color_opt(o, ix) \
f1c96261 456 diff_get_color((o)->use_color, ix)
8f67f8ae 457
ce436973 458
f1922234
JK
459const char *diff_line_prefix(struct diff_options *);
460
461
698ce6f8
JS
462extern const char mime_boundary_leader[];
463
f758a7f8 464struct combine_diff_path *diff_tree_paths(
fda94b41
BW
465 struct combine_diff_path *p, const struct object_id *oid,
466 const struct object_id **parents_oid, int nparent,
72441af7 467 struct strbuf *base, struct diff_options *opt);
0ee3cb88
SG
468void diff_tree_oid(const struct object_id *old_oid,
469 const struct object_id *new_oid,
470 const char *base, struct diff_options *opt);
471void diff_root_tree_oid(const struct object_id *new_oid, const char *base,
472 struct diff_options *opt);
ac1b3d12 473
ea726d02
JH
474struct combine_diff_path {
475 struct combine_diff_path *next;
ea726d02 476 char *path;
2454c962 477 unsigned int mode;
1ff57c13 478 struct object_id oid;
2454c962 479 struct combine_diff_parent {
d416df88 480 char status;
2454c962 481 unsigned int mode;
1ff57c13 482 struct object_id oid;
d76ce4f7 483 struct strbuf path;
2454c962 484 } parent[FLEX_ARRAY];
ea726d02 485};
2454c962 486#define combine_diff_path_size(n, l) \
5b442c4f
JK
487 st_add4(sizeof(struct combine_diff_path), (l), 1, \
488 st_mult(sizeof(struct combine_diff_parent), (n)))
ea726d02 489
f758a7f8 490void show_combined_diff(struct combine_diff_path *elem, int num_parent,
d01141de 491 struct rev_info *);
ea726d02 492
d01141de 493void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
0fe7c1de 494
d01141de 495void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
af3feefa 496
a5a818ee 497void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
6799aadf
JK
498void diff_set_noprefix(struct diff_options *options);
499void diff_set_default_prefix(struct diff_options *options);
a5a818ee 500
f758a7f8 501int diff_can_quit_early(struct diff_options *);
28b9264d 502
f758a7f8
NTND
503void diff_addremove(struct diff_options *,
504 int addremove,
505 unsigned mode,
506 const struct object_id *oid,
507 int oid_valid,
508 const char *fullpath, unsigned dirty_submodule);
77eb2720 509
f758a7f8
NTND
510void diff_change(struct diff_options *,
511 unsigned mode1, unsigned mode2,
512 const struct object_id *old_oid,
513 const struct object_id *new_oid,
514 int old_oid_valid, int new_oid_valid,
515 const char *fullpath,
516 unsigned dirty_submodule1, unsigned dirty_submodule2);
77eb2720 517
f758a7f8 518struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
77eb2720 519
e4cb659e
DF
520void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,
521 struct diff_queue_struct *q);
522void free_diffstat_info(struct diffstat_t *diffstat);
523
19feebc8 524#define DIFF_SETUP_REVERSE 1
f0c6b2a2 525#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 526
dea007fb 527/*
b0d12fc9 528 * Poor man's alternative to parse-option, to allow both stuck form
dea007fb
MM
529 * (--option=value) and separate form (--option value).
530 */
f758a7f8
NTND
531int parse_long_opt(const char *opt, const char **argv,
532 const char **optarg);
533
534int git_diff_basic_config(const char *var, const char *value, void *cb);
535int git_diff_heuristic_config(const char *var, const char *value, void *cb);
536void init_diff_ui_defaults(void);
537int git_diff_ui_config(const char *var, const char *value, void *cb);
e6757652 538void repo_diff_setup(struct repository *, struct diff_options *);
c5630c48 539struct option *add_diff_options(const struct option *, struct diff_options *);
f758a7f8
NTND
540int diff_opt_parse(struct diff_options *, const char **, int, const char *);
541void diff_setup_done(struct diff_options *);
9eac5954
JK
542
543/*
544 * Returns true if the pathspec can work with --follow mode. If die_on_error is
545 * set, die() with a specific error message rather than returning false.
546 */
547int diff_check_follow_pathspec(struct pathspec *ps, int die_on_error);
548
f758a7f8 549int git_config_rename(const char *var, const char *value);
86436c28 550
6b14d7fa
JH
551#define DIFF_DETECT_RENAME 1
552#define DIFF_DETECT_COPY 2
553
367cec1c 554#define DIFF_PICKAXE_ALL 1
d01d8c67 555#define DIFF_PICKAXE_REGEX 2
f345b0a0 556
f506b8e8
JH
557#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
558#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
15af58c1 559#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
f506b8e8 560
15af58c1
SB
561#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
562 DIFF_PICKAXE_KIND_G | \
563 DIFF_PICKAXE_KIND_OBJFIND)
188e9e28
ÆAB
564#define DIFF_PICKAXE_KINDS_G_REGEX_MASK (DIFF_PICKAXE_KIND_G | \
565 DIFF_PICKAXE_REGEX)
d26ec880
ÆAB
566#define DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK (DIFF_PICKAXE_ALL | \
567 DIFF_PICKAXE_KIND_OBJFIND)
cf63051a 568
c1ddc461 569#define DIFF_PICKAXE_IGNORE_CASE 32
f506b8e8 570
f758a7f8 571void diffcore_std(struct diff_options *);
784c0dae 572void diffcore_fix_diff_index(void);
f2ce9fde 573
dda2d79a
JH
574#define COMMON_DIFF_OPTIONS_HELP \
575"\ncommon diff options:\n" \
8082d8d3
JH
576" -z output diff-raw with lines terminated with NUL.\n" \
577" -p output patch format.\n" \
578" -u synonym for -p.\n" \
5c91da25
PB
579" --patch-with-raw\n" \
580" output both a patch and the diff-raw format.\n" \
d75f7952 581" --stat show diffstat instead of patch.\n" \
74e2abe5 582" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
583" --patch-with-stat\n" \
584" output a patch and prepend its diffstat.\n" \
8082d8d3 585" --name-only show only names of changed files.\n" \
946f5f7c 586" --name-status show names and status of changed files.\n" \
47dd0d59 587" --full-index show full object name on index lines.\n" \
913419fc 588" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
589" -R swap input file pairs.\n" \
590" -B detect complete rewrites.\n" \
591" -M detect renames.\n" \
592" -C detect copies.\n" \
dda2d79a 593" --find-copies-harder\n" \
8082d8d3
JH
594" try unchanged files as candidate for copy detection.\n" \
595" -l<n> limit rename attempts up to <n> paths.\n" \
596" -O<file> reorder diffs according to the <file>.\n" \
597" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 598" --pickaxe-all\n" \
ca49920f
SF
599" show all files diff when -S is used and hit is found.\n" \
600" -a --text treat all files as text.\n"
dda2d79a 601
95433eee 602int diff_queue_is_empty(struct diff_options *o);
f758a7f8 603void diff_flush(struct diff_options*);
e900d494 604void diff_free(struct diff_options*);
f758a7f8 605void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
86436c28 606
e7baa4f4 607/* diff-raw status letters */
ca8c9156 608#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
609#define DIFF_STATUS_COPIED 'C'
610#define DIFF_STATUS_DELETED 'D'
611#define DIFF_STATUS_MODIFIED 'M'
612#define DIFF_STATUS_RENAMED 'R'
613#define DIFF_STATUS_TYPE_CHANGED 'T'
614#define DIFF_STATUS_UNKNOWN 'X'
615#define DIFF_STATUS_UNMERGED 'U'
616
617/* these are not diff-raw status letters proper, but used by
618 * diffcore-filter insn to specify additional restrictions.
619 */
0b34379a 620#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
621#define DIFF_STATUS_FILTER_BROKEN 'B'
622
d5e3b01e 623/*
c7c33f50 624 * This is different from repo_find_unique_abbrev() in that
d5e3b01e
JK
625 * it stuffs the result with dots for alignment.
626 */
f758a7f8 627const char *diff_aligned_abbrev(const struct object_id *sha1, int);
47dd0d59 628
177a8302
DL
629void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb);
630
4bd5b7da
JH
631/* do not report anything on removed paths */
632#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
633/* report racily-clean paths as modified */
634#define DIFF_RACY_IS_MODIFIED 02
f758a7f8 635int run_diff_files(struct rev_info *revs, unsigned int option);
4c3fe82e
DL
636
637#define DIFF_INDEX_CACHED 01
0f5a1d44 638#define DIFF_INDEX_MERGE_BASE 02
4c3fe82e 639int run_diff_index(struct rev_info *revs, unsigned int option);
e09ad6e1 640
f758a7f8 641int do_diff_cache(const struct object_id *, struct diff_options *);
51276c18 642int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
36261e42 643void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
fcb3d0ad 644
f758a7f8 645int diff_result_code(struct diff_options *, int);
da31b358 646
dcd6a8c0 647int diff_no_index(struct rev_info *,
16bb3d71 648 int implicit_no_index, int, const char **);
0569e9b8 649
ffc00a48
NTND
650int index_differs_from(struct repository *r, const char *def,
651 const struct diff_flags *flags,
f758a7f8 652 int ita_invisible_in_index);
75f3ff2e 653
72a72390
ES
654/*
655 * Emit an interdiff of two object ID's to 'diff_options.file' optionally
656 * indented by 'indent' spaces.
657 */
658void show_interdiff(const struct object_id *, const struct object_id *,
659 int indent, struct diff_options *);
cdffbdc2 660
a64e6a44
JK
661/*
662 * Fill the contents of the filespec "df", respecting any textconv defined by
663 * its userdiff driver. The "driver" parameter must come from a
664 * previous call to get_textconv(), and therefore should either be NULL or have
665 * textconv enabled.
666 *
667 * Note that the memory ownership of the resulting buffer depends on whether
668 * the driver field is NULL. If it is, then the memory belongs to the filespec
669 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
670 * that should be freed by the caller.
671 */
6afaf807
NTND
672size_t fill_textconv(struct repository *r,
673 struct userdiff_driver *driver,
f758a7f8
NTND
674 struct diff_filespec *df,
675 char **outbuf);
a788d7d5 676
a64e6a44
JK
677/*
678 * Look up the userdiff driver for the given filespec, and return it if
679 * and only if it has textconv enabled (otherwise return NULL). The result
680 * can be passed to fill_textconv().
681 */
bd7ad45b 682struct userdiff_driver *get_textconv(struct repository *r,
acd00ea0 683 struct diff_filespec *one);
a788d7d5 684
3a35cb2e
JS
685/*
686 * Prepare diff_filespec and convert it using diff textconv API
687 * if the textconv driver exists.
688 * Return 1 if the conversion succeeds, 0 otherwise.
689 */
6afaf807
NTND
690int textconv_object(struct repository *repo,
691 const char *path,
692 unsigned mode,
693 const struct object_id *oid, int oid_valid,
694 char **buf, unsigned long *buf_size);
3a35cb2e 695
f758a7f8 696int parse_rename_score(const char **cp_p);
10ae7526 697
f758a7f8 698long parse_algorithm_value(const char *value);
07924d4d 699
f758a7f8
NTND
700void print_stat_summary(FILE *fp, int files,
701 int insertions, int deletions);
702void setup_diff_pager(struct diff_options *);
7f814632 703
86436c28 704#endif /* DIFF_H */