blob: 8ae18e5ab1ef31b5ff8911a3e1fb671bd4043482 [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 09:25:05 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-25 18:22:47 -07004#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano1b0c7172006-03-29 22:55:43 -08007#include "tree-walk.h"
Nguyễn Thái Ngọc Duy64acde92013-07-14 15:35:25 +07008#include "pathspec.h"
brian m. carlson1ff57c12015-03-13 23:39:33 +00009#include "object.h"
Stefan Beller15af58c2018-01-04 14:50:42 -080010#include "oidset.h"
Linus Torvalds50f9a852006-01-31 14:10:56 -080011
Heba Waly13c4d7e2019-11-17 21:04:40 +000012/**
13 * The diff API is for programs that compare two sets of files (e.g. two trees,
14 * one tree and the index) and present the found difference in various ways.
15 * The calling program is responsible for feeding the API pairs of files, one
16 * from the "old" set and the corresponding one from "new" set, that are
17 * different.
18 * The library called through this API is called diffcore, and is responsible
19 * for two things.
20 *
21 * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
22 * changes that touch a string (`-S`), as specified by the caller.
23 *
24 * - outputting the differences in various formats, as specified by the caller.
25 *
26 * Calling sequence
27 * ----------------
28 *
29 * - Prepare `struct diff_options` to record the set of diff options, and then
30 * call `repo_diff_setup()` to initialize this structure. This sets up the
31 * vanilla default.
32 *
33 * - Fill in the options structure to specify desired output format, rename
34 * detection, etc. `diff_opt_parse()` can be used to parse options given
35 * from the command line in a way consistent with existing git-diff family
36 * of programs.
37 *
38 * - Call `diff_setup_done()`; this inspects the options set up so far for
39 * internal consistency and make necessary tweaking to it (e.g. if textual
40 * patch output was asked, recursive behaviour is turned on); the callback
41 * set_default in diff_options can be used to tweak this more.
42 *
43 * - As you find different pairs of files, call `diff_change()` to feed
44 * modified files, `diff_addremove()` to feed created or deleted files, or
45 * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API.
46 * These are thin wrappers to a lower-level `diff_queue()` function that is
47 * flexible enough to record any of these kinds of changes.
48 *
49 * - Once you finish feeding the pairs of files, call `diffcore_std()`.
50 * This will tell the diffcore library to go ahead and do its work.
51 *
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +010052 * - Calling `diff_flush()` will produce the output, it will call
53 * `diff_free()` to free any resources, e.g. those allocated in
54 * `diff_opt_parse()`.
55 *
56 * - Set `.no_free = 1` before calling `diff_flush()` to defer the
57 * freeing of allocated memory in diff_options. This is useful when
58 * `diff_flush()` is being called in a loop, rather than as a
59 * one-off. When setting `.no_free = 1` you must ensure that
60 * `diff_free()` is called at the end, either by flipping the flag
61 * before the last `diff_flush()` call, or by flipping it before
62 * calling `diff_free()` yourself.
Heba Waly13c4d7e2019-11-17 21:04:40 +000063 */
64
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070065struct combine_diff_path;
66struct commit;
67struct diff_filespec;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070068struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040069struct diff_queue_struct;
brian m. carlson910650d2017-03-31 01:40:00 +000070struct oid_array;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +070071struct option;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +020072struct repository;
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070073struct rev_info;
74struct strbuf;
75struct userdiff_driver;
Kirill Smelkov72441af2014-04-07 01:46:26 +040076
77typedef int (*pathchange_fn_t)(struct diff_options *options,
78 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070079
80typedef void (*change_fn_t)(struct diff_options *options,
81 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 10:30:49 -070082 const struct object_id *old_oid,
83 const struct object_id *new_oid,
84 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010085 const char *fullpath,
86 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070087
88typedef void (*add_remove_fn_t)(struct diff_options *options,
89 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -070090 const struct object_id *oid,
91 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010092 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070093
Jeff King04245582006-09-07 02:35:42 -040094typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
95 struct diff_options *options, void *data);
96
Bo Yanga3c158d2010-05-26 15:08:02 +080097typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
98
Timo Hirvonenc6744342006-06-24 20:21:53 +030099#define DIFF_FORMAT_RAW 0x0001
100#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700101#define DIFF_FORMAT_NUMSTAT 0x0004
102#define DIFF_FORMAT_SUMMARY 0x0008
103#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -0500104#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 13:26:31 -0800105#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 20:21:53 +0300106
107/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700108#define DIFF_FORMAT_NAME 0x0100
109#define DIFF_FORMAT_NAME_STATUS 0x0200
110#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +0300111
112/* Same as output_format = 0 but we know that -s flag was given
113 * and we should not give default value to output_format.
114 */
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700115#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +0300116
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700117#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -0400118
Brandon Williams02f2f562017-10-31 11:19:05 -0700119#define DIFF_FLAGS_INIT { 0 }
120struct diff_flags {
Heba Waly13c4d7e2019-11-17 21:04:40 +0000121
122 /**
123 * Tells if tree traversal done by tree-diff should recursively descend
124 * into a tree object pair that are different in preimage and postimage set.
125 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700126 unsigned recursive;
127 unsigned tree_in_recursive;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000128
129 /* Affects the way how a file that is seemingly binary is treated. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700130 unsigned binary;
131 unsigned text;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000132
133 /**
134 * Tells the patch output format not to use abbreviated object names on the
135 * "index" lines.
136 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700137 unsigned full_index;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000138
139 /* Affects if diff-files shows removed files. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700140 unsigned silent_on_remove;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000141
142 /**
143 * Tells the diffcore library that the caller is feeding unchanged
144 * filepairs to allow copies from unmodified files be detected.
145 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700146 unsigned find_copies_harder;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000147
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700148 unsigned follow_renames;
149 unsigned rename_empty;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000150
151 /* Internal; used for optimization to see if there is any change. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700152 unsigned has_changes;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000153
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700154 unsigned quick;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000155
156 /**
157 * Tells diff-files that the input is not tracked files but files in random
158 * locations on the filesystem.
159 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700160 unsigned no_index;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000161
162 /**
163 * Tells output routine that it is Ok to call user specified patch output
164 * routine. Plumbing disables this to ensure stable output.
165 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700166 unsigned allow_external;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000167
168 /**
169 * For communication between the calling program and the options parser;
170 * tell the calling program to signal the presence of difference using
171 * program exit code.
172 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700173 unsigned exit_with_status;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000174
175 /**
176 * Tells the library that the calling program is feeding the filepairs
177 * reversed; `one` is two, and `two` is one.
178 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700179 unsigned reverse_diff;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000180
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700181 unsigned check_failed;
182 unsigned relative_name;
183 unsigned ignore_submodules;
184 unsigned dirstat_cumulative;
185 unsigned dirstat_by_file;
186 unsigned allow_textconv;
187 unsigned textconv_set_via_cmdline;
188 unsigned diff_from_contents;
189 unsigned dirty_submodules;
190 unsigned ignore_untracked_in_submodules;
Sangeeta Jain8ef93122020-11-10 14:09:00 +0530191 unsigned ignore_submodule_set;
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700192 unsigned ignore_dirty_submodules;
193 unsigned override_submodule_config;
194 unsigned dirstat_by_line;
195 unsigned funccontext;
196 unsigned default_follow_renames;
197 unsigned stat_with_summary;
198 unsigned suppress_diff_headers;
199 unsigned dual_color_diffed_diffs;
Thomas Gummerer430be362019-07-11 17:08:48 +0100200 unsigned suppress_hunk_header_line_count;
Brandon Williams02f2f562017-10-31 11:19:05 -0700201};
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200202
Brandon Williams02f2f562017-10-31 11:19:05 -0700203static inline void diff_flags_or(struct diff_flags *a,
204 const struct diff_flags *b)
205{
206 char *tmp_a = (char *)a;
207 const char *tmp_b = (const char *)b;
208 int i;
209
210 for (i = 0; i < sizeof(struct diff_flags); i++)
211 tmp_a[i] |= tmp_b[i];
212}
213
Keith Cascio628d5c22009-02-16 19:26:49 -0800214#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
215#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
216#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100217
Junio C Hamano307ab202012-02-19 15:36:55 -0800218#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
219
Thomas Rast882749a2010-04-14 17:59:06 +0200220enum diff_words_type {
221 DIFF_WORDS_NONE = 0,
222 DIFF_WORDS_PORCELAIN,
223 DIFF_WORDS_PLAIN,
224 DIFF_WORDS_COLOR
225};
226
Jacob Keller61cfbc02016-08-31 16:27:21 -0700227enum diff_submodule_format {
228 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700229 DIFF_SUBMODULE_LOG,
230 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 16:27:21 -0700231};
232
Heba Waly13c4d7e2019-11-17 21:04:40 +0000233/**
234 * the set of options the calling program wants to affect the operation of
235 * diffcore library with.
236 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700237struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700238 const char *orderfile;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000239
Junio C Hamano1eb41362021-02-11 11:57:50 -0800240 /*
241 * "--rotate-to=<file>" would start showing at <file> and when
242 * the output reaches the end, wrap around by default.
243 * Setting skip_instead_of_rotate to true stops the output at the
244 * end, effectively discarding the earlier part of the output
245 * before <file>'s diff (this is used to implement the
246 * "--skip-to=<file>" option).
247 *
248 * When rotate_to_strict is set, it is an error if there is no
249 * <file> in the diff. Otherwise, the output starts at the
250 * path that is the same as, or first path that sorts after,
251 * <file>. Because it is unreasonable to require the exact
252 * match for "git log -p --rotate-to=<file>" (i.e. not all
253 * commit would touch that single <file>), "git log" sets it
254 * to false. "git diff" sets it to true to detect an error
255 * in the command line option.
256 */
257 const char *rotate_to;
258 int skip_instead_of_rotate;
259 int rotate_to_strict;
260
Heba Waly13c4d7e2019-11-17 21:04:40 +0000261 /**
262 * A constant string (can and typically does contain newlines to look for
263 * a block of text, not just a single line) to filter out the filepairs
264 * that do not change the number of strings contained in its preimage and
265 * postimage of the diff_queue.
266 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700267 const char *pickaxe;
Ævar Arnfjörð Bjarmasona47fcbe2021-04-12 19:15:16 +0200268 unsigned pickaxe_opts;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000269
Michał Kępień296d4a92020-10-20 08:48:09 +0200270 /* -I<regex> */
271 regex_t **ignore_regex;
272 size_t ignore_regex_nr, ignore_regex_alloc;
273
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800274 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000275 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 16:27:20 -0700276 const char *line_prefix;
277 size_t line_prefix_length;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000278
279 /**
280 * collection of boolean options that affects the operation, but some do
281 * not have anything to do with the diffcore library.
282 */
Brandon Williams02f2f562017-10-31 11:19:05 -0700283 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700284
285 /* diff-filter bits */
Johannes Schindelin75408ca2022-01-28 12:02:50 +0000286 unsigned int filter, filter_not;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700287
Jeff Kingf1c96262011-08-17 22:03:12 -0700288 int use_color;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000289
290 /* Number of context lines to generate in patch output. */
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700291 int context;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000292
René Scharfe6d0e6742008-12-28 19:45:32 +0100293 int interhunkcontext;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000294
295 /* Affects the way detection logic for complete rewrites, renames and
296 * copies.
297 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700298 int break_opt;
299 int detect_rename;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000300
Junio C Hamano467ddc12011-02-28 16:11:55 -0800301 int irreversible_delete;
Junio C Hamanofb132272007-08-03 13:33:31 -0700302 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700303 int line_termination;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000304
305 /* The output format used when `diff_flush()` is run. */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700306 int output_format;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000307
Heba Waly13c4d7e2019-11-17 21:04:40 +0000308 /* Affects the way detection logic for complete rewrites, renames and
309 * copies.
310 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700311 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700312 int rename_limit;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000313
Jeff Kingbf0ab102011-02-19 05:20:51 -0500314 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800315 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 04:51:16 -0500316 int show_rename_progress;
Johan Herland712d2c72011-04-29 11:36:20 +0200317 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700318 int setup;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000319
320 /* Number of hexdigits to abbreviate raw format output to. */
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800321 int abbrev;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000322
Derrick Stoleee3696982020-03-30 00:31:27 +0000323 /* If non-zero, then stop computing after this many changes. */
324 int max_changes;
Derrick Stoleee3696982020-03-30 00:31:27 +0000325
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700326 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 10:11:28 -0700327/* white-space error highlighting */
Stefan Beller091f8e22017-06-29 17:06:53 -0700328#define WSEH_NEW (1<<12)
329#define WSEH_CONTEXT (1<<13)
330#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 10:11:28 -0700331 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800332 const char *prefix;
333 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200334 const char *stat_sep;
Nguyễn Thái Ngọc Duy7f125ff2019-05-29 16:11:14 +0700335 int xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700336
Jonathan Tan2477ab22017-11-27 11:47:47 -0800337 /* see Documentation/diff-options.txt */
338 char **anchors;
339 size_t anchors_nr, anchors_alloc;
340
Junio C Hamanoa2540022006-09-26 18:53:02 -0700341 int stat_width;
342 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +0100343 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +0200344 int stat_count;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100345 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200346 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 16:27:21 -0700347 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700348
Stefan Beller15af58c2018-01-04 14:50:42 -0800349 struct oidset *objfind;
350
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100351 /* this is set by diffcore for DIFF_FORMAT_PATCH */
352 int found_changes;
353
Junio C Hamano44c48a92010-08-13 12:17:45 -0700354 /* to support internal diff recursion by --follow hack*/
355 int found_follow;
356
Heba Waly13c4d7e2019-11-17 21:04:40 +0000357 /* Callback which allows tweaking the options in diff_setup_done(). */
Junio C Hamano6c374002013-05-10 17:10:11 +0200358 void (*set_default)(struct diff_options *);
359
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400360 FILE *file;
361 int close_file;
362
Stefan Beller7648b792018-08-17 13:43:52 -0700363#define OUTPUT_INDICATOR_NEW 0
364#define OUTPUT_INDICATOR_OLD 1
365#define OUTPUT_INDICATOR_CONTEXT 2
366 char output_indicators[3];
367
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700368 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-07 01:46:26 +0400369 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700370 change_fn_t change;
371 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 11:27:45 -0400372 void *change_fn_data;
Jeff King04245582006-09-07 02:35:42 -0400373 diff_format_fn_t format_callback;
374 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800375 diff_prefix_fn_t output_prefix;
376 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +1100377
378 int diff_path_counter;
Stefan Bellere6e045f2017-06-29 17:07:06 -0700379
380 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700381 enum {
382 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 13:53:08 -0700383 COLOR_MOVED_PLAIN = 1,
Stefan Beller51da15e2018-07-16 16:05:39 -0700384 COLOR_MOVED_BLOCKS = 2,
385 COLOR_MOVED_ZEBRA = 3,
386 COLOR_MOVED_ZEBRA_DIM = 4,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700387 } color_moved;
388 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-15 18:27:39 -0700389 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700390
391 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
392 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
Stefan Bellerd173e792018-11-13 13:33:57 -0800393 #define COLOR_MOVED_WS_ERROR (1<<0)
394 unsigned color_moved_ws_handling;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200395
396 struct repository *repo;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +0700397 struct option *parseopts;
Elijah Newren95433ee2022-02-02 02:37:34 +0000398 struct strmap *additional_path_headers;
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +0100399
400 int no_free;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700401};
402
Nguyễn Thái Ngọc Duycdb53302019-03-24 15:20:14 +0700403unsigned diff_filter_bit(char status);
404
Stefan Bellerf3597132017-06-29 17:07:00 -0700405void diff_emit_submodule_del(struct diff_options *o, const char *line);
406void diff_emit_submodule_add(struct diff_options *o, const char *line);
407void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
408void diff_emit_submodule_modified(struct diff_options *o, const char *path);
409void diff_emit_submodule_header(struct diff_options *o, const char *header);
410void diff_emit_submodule_error(struct diff_options *o, const char *err);
411void diff_emit_submodule_pipethrough(struct diff_options *o,
412 const char *line, int len);
413
Daniel Ferreirae4cb6592019-11-13 12:40:58 +0000414struct diffstat_t {
415 int nr;
416 int alloc;
417 struct diffstat_file {
418 char *from_name;
419 char *name;
420 char *print_name;
421 const char *comments;
422 unsigned is_unmerged:1;
423 unsigned is_binary:1;
424 unsigned is_renamed:1;
425 unsigned is_interesting:1;
426 uintmax_t added, deleted;
427 } **files;
428};
429
Jeff Kingce436972006-07-23 05:24:18 -0400430enum color_diff {
431 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 16:48:46 -0400432 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 05:24:18 -0400433 DIFF_METAINFO = 2,
434 DIFF_FRAGINFO = 3,
435 DIFF_FILE_OLD = 4,
436 DIFF_FILE_NEW = 5,
437 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700438 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700439 DIFF_FUNCINFO = 8,
440 DIFF_FILE_OLD_MOVED = 9,
441 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 13:53:09 -0700442 DIFF_FILE_OLD_MOVED_DIM = 11,
443 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
444 DIFF_FILE_NEW_MOVED = 13,
445 DIFF_FILE_NEW_MOVED_ALT = 14,
446 DIFF_FILE_NEW_MOVED_DIM = 15,
Johannes Schindelina7be92a2018-08-13 04:33:32 -0700447 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
448 DIFF_CONTEXT_DIM = 17,
449 DIFF_FILE_OLD_DIM = 18,
450 DIFF_FILE_NEW_DIM = 19,
451 DIFF_CONTEXT_BOLD = 20,
452 DIFF_FILE_OLD_BOLD = 21,
453 DIFF_FILE_NEW_BOLD = 22,
Jeff Kingce436972006-07-23 05:24:18 -0400454};
Heba Waly13c4d7e2019-11-17 21:04:40 +0000455
Jeff Kingce436972006-07-23 05:24:18 -0400456const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100457#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -0700458 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100459
Jeff Kingce436972006-07-23 05:24:18 -0400460
John Keepingf1922232013-02-07 20:15:26 +0000461const char *diff_line_prefix(struct diff_options *);
462
463
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200464extern const char mime_boundary_leader[];
465
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200466struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 10:31:06 -0700467 struct combine_diff_path *p, const struct object_id *oid,
468 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-07 01:46:26 +0400469 struct strbuf *base, struct diff_options *opt);
SZEDER Gábor0ee3cb82020-06-05 13:00:27 +0000470void diff_tree_oid(const struct object_id *old_oid,
471 const struct object_id *new_oid,
472 const char *base, struct diff_options *opt);
473void diff_root_tree_oid(const struct object_id *new_oid, const char *base,
474 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700475
Junio C Hamanoea726d02006-01-28 00:03:38 -0800476struct combine_diff_path {
477 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800478 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800479 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000480 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800481 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800482 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800483 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000484 struct object_id oid;
Elijah Newrend76ce4f2019-02-07 17:12:46 -0800485 struct strbuf path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800486 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800487};
Junio C Hamano2454c962006-02-06 12:53:07 -0800488#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 06:21:30 -0500489 st_add4(sizeof(struct combine_diff_path), (l), 1, \
490 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 00:03:38 -0800491
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200492void show_combined_diff(struct combine_diff_path *elem, int num_parent,
Sergey Organovd01141d2020-09-29 14:31:22 +0300493 struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800494
Sergey Organovd01141d2020-09-29 14:31:22 +0300495void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700496
Sergey Organovd01141d2020-09-29 14:31:22 +0300497void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800498
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700499void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
500
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200501int diff_can_quit_early(struct diff_options *);
Junio C Hamano28b92642011-05-31 09:14:17 -0700502
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200503void 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);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700509
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200510void 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);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700517
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200518struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700519
Daniel Ferreirae4cb6592019-11-13 12:40:58 +0000520void 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
Junio C Hamano19feebc2005-05-27 15:54:37 -0700524#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700525#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700526
Matthieu Moydea007f2010-08-05 10:22:52 +0200527/*
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +0100528 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 10:22:52 +0200529 * (--option=value) and separate form (--option value).
530 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200531int parse_long_opt(const char *opt, const char **argv,
532 const char **optarg);
Matthieu Moydea007f2010-08-05 10:22:52 +0200533
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200534int 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);
Nguyễn Thái Ngọc Duye6757652018-09-21 17:57:24 +0200538#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
539#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
540#endif
541void repo_diff_setup(struct repository *, struct diff_options *);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200542int diff_opt_parse(struct diff_options *, const char **, int, const char *);
543void diff_setup_done(struct diff_options *);
544int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-25 18:22:47 -0700545
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700546#define DIFF_DETECT_RENAME 1
547#define DIFF_DETECT_COPY 2
548
Junio C Hamano367cec12005-05-27 15:55:28 -0700549#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200550#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700551
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700552#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
553#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 14:50:42 -0800554#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700555
Stefan Beller15af58c2018-01-04 14:50:42 -0800556#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
557 DIFF_PICKAXE_KIND_G | \
558 DIFF_PICKAXE_KIND_OBJFIND)
Ævar Arnfjörð Bjarmason188e9e22021-04-12 19:15:14 +0200559#define DIFF_PICKAXE_KINDS_G_REGEX_MASK (DIFF_PICKAXE_KIND_G | \
560 DIFF_PICKAXE_REGEX)
Ævar Arnfjörð Bjarmasond26ec882021-04-12 19:15:15 +0200561#define DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK (DIFF_PICKAXE_ALL | \
562 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 14:50:41 -0800563
Stefan Bellerc1ddc462018-01-04 14:50:40 -0800564#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700565
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200566void diffcore_std(struct diff_options *);
Jeff King784c0da2019-02-14 00:48:03 -0500567void diffcore_fix_diff_index(void);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700568
Junio C Hamanodda2d792005-07-13 12:52:35 -0700569#define COMMON_DIFF_OPTIONS_HELP \
570"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700571" -z output diff-raw with lines terminated with NUL.\n" \
572" -p output patch format.\n" \
573" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200574" --patch-with-raw\n" \
575" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200576" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700577" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200578" --patch-with-stat\n" \
579" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700580" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700581" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800582" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800583" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700584" -R swap input file pairs.\n" \
585" -B detect complete rewrites.\n" \
586" -M detect renames.\n" \
587" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700588" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700589" try unchanged files as candidate for copy detection.\n" \
590" -l<n> limit rename attempts up to <n> paths.\n" \
591" -O<file> reorder diffs according to the <file>.\n" \
592" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700593" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200594" show all files diff when -S is used and hit is found.\n" \
595" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700596
Elijah Newren95433ee2022-02-02 02:37:34 +0000597int diff_queue_is_empty(struct diff_options *o);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200598void diff_flush(struct diff_options*);
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +0100599void diff_free(struct diff_options*);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200600void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-25 18:22:47 -0700601
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700602/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700603#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700604#define DIFF_STATUS_COPIED 'C'
605#define DIFF_STATUS_DELETED 'D'
606#define DIFF_STATUS_MODIFIED 'M'
607#define DIFF_STATUS_RENAMED 'R'
608#define DIFF_STATUS_TYPE_CHANGED 'T'
609#define DIFF_STATUS_UNKNOWN 'X'
610#define DIFF_STATUS_UNMERGED 'U'
611
612/* these are not diff-raw status letters proper, but used by
613 * diffcore-filter insn to specify additional restrictions.
614 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700615#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700616#define DIFF_STATUS_FILTER_BROKEN 'B'
617
Jeff Kingd5e3b012016-10-20 02:19:43 -0400618/*
619 * This is different from find_unique_abbrev() in that
620 * it stuffs the result with dots for alignment.
621 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200622const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800623
Denton Liu177a8302020-09-20 04:22:23 -0700624void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb);
625
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800626/* do not report anything on removed paths */
627#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800628/* report racily-clean paths as modified */
629#define DIFF_RACY_IS_MODIFIED 02
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200630int run_diff_files(struct rev_info *revs, unsigned int option);
Denton Liu4c3fe822020-09-20 04:22:22 -0700631
632#define DIFF_INDEX_CACHED 01
Denton Liu0f5a1d42020-09-20 04:22:25 -0700633#define DIFF_INDEX_MERGE_BASE 02
Denton Liu4c3fe822020-09-20 04:22:22 -0700634int run_diff_index(struct rev_info *revs, unsigned int option);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700635
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200636int do_diff_cache(const struct object_id *, struct diff_options *);
Stephen Boyda8f68552019-04-26 16:51:57 -0700637int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
brian m. carlson36261e42019-08-18 20:04:03 +0000638void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200639
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200640int diff_result_code(struct diff_options *, int);
Junio C Hamanoda31b352007-12-13 23:40:27 -0800641
Junio C Hamanodcd6a8c2019-04-25 16:41:12 +0900642int diff_no_index(struct rev_info *,
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700643 int implicit_no_index, int, const char **);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700644
Nguyễn Thái Ngọc Duyffc00a42018-11-10 06:49:04 +0100645int index_differs_from(struct repository *r, const char *def,
646 const struct diff_flags *flags,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200647 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100648
Eric Sunshine72a72392020-09-08 03:16:09 -0400649/*
650 * Emit an interdiff of two object ID's to 'diff_options.file' optionally
651 * indented by 'indent' spaces.
652 */
653void show_interdiff(const struct object_id *, const struct object_id *,
654 int indent, struct diff_options *);
Eric Sunshinecdffbdc2020-09-08 03:16:08 -0400655
Jeff Kinga64e6a42016-02-22 13:28:54 -0500656/*
657 * Fill the contents of the filespec "df", respecting any textconv defined by
658 * its userdiff driver. The "driver" parameter must come from a
659 * previous call to get_textconv(), and therefore should either be NULL or have
660 * textconv enabled.
661 *
662 * Note that the memory ownership of the resulting buffer depends on whether
663 * the driver field is NULL. If it is, then the memory belongs to the filespec
664 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
665 * that should be freed by the caller.
666 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200667size_t fill_textconv(struct repository *r,
668 struct userdiff_driver *driver,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200669 struct diff_filespec *df,
670 char **outbuf);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200671
Jeff Kinga64e6a42016-02-22 13:28:54 -0500672/*
673 * Look up the userdiff driver for the given filespec, and return it if
674 * and only if it has textconv enabled (otherwise return NULL). The result
675 * can be passed to fill_textconv().
676 */
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +0100677struct userdiff_driver *get_textconv(struct repository *r,
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +0200678 struct diff_filespec *one);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200679
Jeff Smith3a35cb22017-05-24 00:15:10 -0500680/*
681 * Prepare diff_filespec and convert it using diff textconv API
682 * if the textconv driver exists.
683 * Return 1 if the conversion succeeds, 0 otherwise.
684 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200685int textconv_object(struct repository *repo,
686 const char *path,
687 unsigned mode,
688 const struct object_id *oid, int oid_valid,
689 char **buf, unsigned long *buf_size);
Jeff Smith3a35cb22017-05-24 00:15:10 -0500690
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200691int parse_rename_score(const char **cp_p);
Kevin Ballard10ae7522010-09-27 16:58:25 -0700692
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200693long parse_algorithm_value(const char *value);
Michal Privoznik07924d42013-01-16 08:51:58 +0100694
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200695void print_stat_summary(FILE *fp, int files,
696 int insertions, int deletions);
697void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700698
Junio C Hamano86436c22005-04-25 18:22:47 -0700699#endif /* DIFF_H */