blob: 6febe7e3656ae4da3923d9485bb9dee10c1d5acd [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 *
52 * - Calling `diff_flush()` will produce the output.
53 */
54
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070055struct combine_diff_path;
56struct commit;
57struct diff_filespec;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070058struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040059struct diff_queue_struct;
brian m. carlson910650d2017-03-31 01:40:00 +000060struct oid_array;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +070061struct option;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +020062struct repository;
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070063struct rev_info;
64struct strbuf;
65struct userdiff_driver;
Kirill Smelkov72441af2014-04-07 01:46:26 +040066
67typedef int (*pathchange_fn_t)(struct diff_options *options,
68 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070069
70typedef void (*change_fn_t)(struct diff_options *options,
71 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 10:30:49 -070072 const struct object_id *old_oid,
73 const struct object_id *new_oid,
74 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010075 const char *fullpath,
76 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070077
78typedef void (*add_remove_fn_t)(struct diff_options *options,
79 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -070080 const struct object_id *oid,
81 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010082 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070083
Jeff King04245582006-09-07 02:35:42 -040084typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
85 struct diff_options *options, void *data);
86
Bo Yanga3c158d2010-05-26 15:08:02 +080087typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
88
Timo Hirvonenc6744342006-06-24 20:21:53 +030089#define DIFF_FORMAT_RAW 0x0001
90#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -070091#define DIFF_FORMAT_NUMSTAT 0x0004
92#define DIFF_FORMAT_SUMMARY 0x0008
93#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -050094#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 13:26:31 -080095#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 20:21:53 +030096
97/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070098#define DIFF_FORMAT_NAME 0x0100
99#define DIFF_FORMAT_NAME_STATUS 0x0200
100#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +0300101
102/* Same as output_format = 0 but we know that -s flag was given
103 * and we should not give default value to output_format.
104 */
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700105#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +0300106
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700107#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -0400108
Brandon Williams02f2f562017-10-31 11:19:05 -0700109#define DIFF_FLAGS_INIT { 0 }
110struct diff_flags {
Heba Waly13c4d7e2019-11-17 21:04:40 +0000111
112 /**
113 * Tells if tree traversal done by tree-diff should recursively descend
114 * into a tree object pair that are different in preimage and postimage set.
115 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700116 unsigned recursive;
117 unsigned tree_in_recursive;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000118
119 /* Affects the way how a file that is seemingly binary is treated. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700120 unsigned binary;
121 unsigned text;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000122
123 /**
124 * Tells the patch output format not to use abbreviated object names on the
125 * "index" lines.
126 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700127 unsigned full_index;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000128
129 /* Affects if diff-files shows removed files. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700130 unsigned silent_on_remove;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000131
132 /**
133 * Tells the diffcore library that the caller is feeding unchanged
134 * filepairs to allow copies from unmodified files be detected.
135 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700136 unsigned find_copies_harder;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000137
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700138 unsigned follow_renames;
139 unsigned rename_empty;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000140
141 /* Internal; used for optimization to see if there is any change. */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700142 unsigned has_changes;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000143
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700144 unsigned quick;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000145
146 /**
147 * Tells diff-files that the input is not tracked files but files in random
148 * locations on the filesystem.
149 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700150 unsigned no_index;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000151
152 /**
153 * Tells output routine that it is Ok to call user specified patch output
154 * routine. Plumbing disables this to ensure stable output.
155 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700156 unsigned allow_external;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000157
158 /**
159 * For communication between the calling program and the options parser;
160 * tell the calling program to signal the presence of difference using
161 * program exit code.
162 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700163 unsigned exit_with_status;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000164
165 /**
166 * Tells the library that the calling program is feeding the filepairs
167 * reversed; `one` is two, and `two` is one.
168 */
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700169 unsigned reverse_diff;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000170
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +0700171 unsigned check_failed;
172 unsigned relative_name;
173 unsigned ignore_submodules;
174 unsigned dirstat_cumulative;
175 unsigned dirstat_by_file;
176 unsigned allow_textconv;
177 unsigned textconv_set_via_cmdline;
178 unsigned diff_from_contents;
179 unsigned dirty_submodules;
180 unsigned ignore_untracked_in_submodules;
181 unsigned ignore_dirty_submodules;
182 unsigned override_submodule_config;
183 unsigned dirstat_by_line;
184 unsigned funccontext;
185 unsigned default_follow_renames;
186 unsigned stat_with_summary;
187 unsigned suppress_diff_headers;
188 unsigned dual_color_diffed_diffs;
Thomas Gummerer430be362019-07-11 17:08:48 +0100189 unsigned suppress_hunk_header_line_count;
Brandon Williams02f2f562017-10-31 11:19:05 -0700190};
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200191
Brandon Williams02f2f562017-10-31 11:19:05 -0700192static inline void diff_flags_or(struct diff_flags *a,
193 const struct diff_flags *b)
194{
195 char *tmp_a = (char *)a;
196 const char *tmp_b = (const char *)b;
197 int i;
198
199 for (i = 0; i < sizeof(struct diff_flags); i++)
200 tmp_a[i] |= tmp_b[i];
201}
202
Keith Cascio628d5c22009-02-16 19:26:49 -0800203#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
204#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
205#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100206
Junio C Hamano307ab202012-02-19 15:36:55 -0800207#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
208
Thomas Rast882749a2010-04-14 17:59:06 +0200209enum diff_words_type {
210 DIFF_WORDS_NONE = 0,
211 DIFF_WORDS_PORCELAIN,
212 DIFF_WORDS_PLAIN,
213 DIFF_WORDS_COLOR
214};
215
Jacob Keller61cfbc02016-08-31 16:27:21 -0700216enum diff_submodule_format {
217 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700218 DIFF_SUBMODULE_LOG,
219 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 16:27:21 -0700220};
221
Heba Waly13c4d7e2019-11-17 21:04:40 +0000222/**
223 * the set of options the calling program wants to affect the operation of
224 * diffcore library with.
225 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700226struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700227 const char *orderfile;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000228
229 /**
230 * A constant string (can and typically does contain newlines to look for
231 * a block of text, not just a single line) to filter out the filepairs
232 * that do not change the number of strings contained in its preimage and
233 * postimage of the diff_queue.
234 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700235 const char *pickaxe;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000236
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800237 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000238 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 16:27:20 -0700239 const char *line_prefix;
240 size_t line_prefix_length;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000241
242 /**
243 * collection of boolean options that affects the operation, but some do
244 * not have anything to do with the diffcore library.
245 */
Brandon Williams02f2f562017-10-31 11:19:05 -0700246 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700247
248 /* diff-filter bits */
249 unsigned int filter;
250
Jeff Kingf1c96262011-08-17 22:03:12 -0700251 int use_color;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000252
253 /* Number of context lines to generate in patch output. */
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700254 int context;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000255
René Scharfe6d0e6742008-12-28 19:45:32 +0100256 int interhunkcontext;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000257
258 /* Affects the way detection logic for complete rewrites, renames and
259 * copies.
260 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700261 int break_opt;
262 int detect_rename;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000263
Junio C Hamano467ddc12011-02-28 16:11:55 -0800264 int irreversible_delete;
Junio C Hamanofb132272007-08-03 13:33:31 -0700265 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700266 int line_termination;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000267
268 /* The output format used when `diff_flush()` is run. */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700269 int output_format;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000270
Stefan Beller929ed702018-01-04 14:50:39 -0800271 unsigned pickaxe_opts;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000272
273 /* Affects the way detection logic for complete rewrites, renames and
274 * copies.
275 */
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700276 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700277 int rename_limit;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000278
Jeff Kingbf0ab102011-02-19 05:20:51 -0500279 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800280 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 04:51:16 -0500281 int show_rename_progress;
Johan Herland712d2c72011-04-29 11:36:20 +0200282 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700283 int setup;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000284
285 /* Number of hexdigits to abbreviate raw format output to. */
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800286 int abbrev;
Heba Waly13c4d7e2019-11-17 21:04:40 +0000287
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700288 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 10:11:28 -0700289/* white-space error highlighting */
Stefan Beller091f8e22017-06-29 17:06:53 -0700290#define WSEH_NEW (1<<12)
291#define WSEH_CONTEXT (1<<13)
292#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 10:11:28 -0700293 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800294 const char *prefix;
295 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200296 const char *stat_sep;
Nguyễn Thái Ngọc Duy7f125ff2019-05-29 16:11:14 +0700297 int xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700298
Jonathan Tan2477ab22017-11-27 11:47:47 -0800299 /* see Documentation/diff-options.txt */
300 char **anchors;
301 size_t anchors_nr, anchors_alloc;
302
Junio C Hamanoa2540022006-09-26 18:53:02 -0700303 int stat_width;
304 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +0100305 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +0200306 int stat_count;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100307 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200308 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 16:27:21 -0700309 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700310
Stefan Beller15af58c2018-01-04 14:50:42 -0800311 struct oidset *objfind;
312
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100313 /* this is set by diffcore for DIFF_FORMAT_PATCH */
314 int found_changes;
315
Junio C Hamano44c48a92010-08-13 12:17:45 -0700316 /* to support internal diff recursion by --follow hack*/
317 int found_follow;
318
Heba Waly13c4d7e2019-11-17 21:04:40 +0000319 /* Callback which allows tweaking the options in diff_setup_done(). */
Junio C Hamano6c374002013-05-10 17:10:11 +0200320 void (*set_default)(struct diff_options *);
321
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400322 FILE *file;
323 int close_file;
324
Stefan Beller7648b792018-08-17 13:43:52 -0700325#define OUTPUT_INDICATOR_NEW 0
326#define OUTPUT_INDICATOR_OLD 1
327#define OUTPUT_INDICATOR_CONTEXT 2
328 char output_indicators[3];
329
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700330 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-07 01:46:26 +0400331 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700332 change_fn_t change;
333 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 11:27:45 -0400334 void *change_fn_data;
Jeff King04245582006-09-07 02:35:42 -0400335 diff_format_fn_t format_callback;
336 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800337 diff_prefix_fn_t output_prefix;
338 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +1100339
340 int diff_path_counter;
Stefan Bellere6e045f2017-06-29 17:07:06 -0700341
342 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700343 enum {
344 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 13:53:08 -0700345 COLOR_MOVED_PLAIN = 1,
Stefan Beller51da15e2018-07-16 16:05:39 -0700346 COLOR_MOVED_BLOCKS = 2,
347 COLOR_MOVED_ZEBRA = 3,
348 COLOR_MOVED_ZEBRA_DIM = 4,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700349 } color_moved;
350 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-15 18:27:39 -0700351 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700352
353 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
354 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
Stefan Bellerd173e792018-11-13 13:33:57 -0800355 #define COLOR_MOVED_WS_ERROR (1<<0)
356 unsigned color_moved_ws_handling;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200357
358 struct repository *repo;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +0700359 struct option *parseopts;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700360};
361
Nguyễn Thái Ngọc Duycdb53302019-03-24 15:20:14 +0700362unsigned diff_filter_bit(char status);
363
Stefan Bellerf3597132017-06-29 17:07:00 -0700364void diff_emit_submodule_del(struct diff_options *o, const char *line);
365void diff_emit_submodule_add(struct diff_options *o, const char *line);
366void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
367void diff_emit_submodule_modified(struct diff_options *o, const char *path);
368void diff_emit_submodule_header(struct diff_options *o, const char *header);
369void diff_emit_submodule_error(struct diff_options *o, const char *err);
370void diff_emit_submodule_pipethrough(struct diff_options *o,
371 const char *line, int len);
372
Daniel Ferreirae4cb6592019-11-13 12:40:58 +0000373struct diffstat_t {
374 int nr;
375 int alloc;
376 struct diffstat_file {
377 char *from_name;
378 char *name;
379 char *print_name;
380 const char *comments;
381 unsigned is_unmerged:1;
382 unsigned is_binary:1;
383 unsigned is_renamed:1;
384 unsigned is_interesting:1;
385 uintmax_t added, deleted;
386 } **files;
387};
388
Jeff Kingce436972006-07-23 05:24:18 -0400389enum color_diff {
390 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 16:48:46 -0400391 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 05:24:18 -0400392 DIFF_METAINFO = 2,
393 DIFF_FRAGINFO = 3,
394 DIFF_FILE_OLD = 4,
395 DIFF_FILE_NEW = 5,
396 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700397 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700398 DIFF_FUNCINFO = 8,
399 DIFF_FILE_OLD_MOVED = 9,
400 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 13:53:09 -0700401 DIFF_FILE_OLD_MOVED_DIM = 11,
402 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
403 DIFF_FILE_NEW_MOVED = 13,
404 DIFF_FILE_NEW_MOVED_ALT = 14,
405 DIFF_FILE_NEW_MOVED_DIM = 15,
Johannes Schindelina7be92a2018-08-13 04:33:32 -0700406 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
407 DIFF_CONTEXT_DIM = 17,
408 DIFF_FILE_OLD_DIM = 18,
409 DIFF_FILE_NEW_DIM = 19,
410 DIFF_CONTEXT_BOLD = 20,
411 DIFF_FILE_OLD_BOLD = 21,
412 DIFF_FILE_NEW_BOLD = 22,
Jeff Kingce436972006-07-23 05:24:18 -0400413};
Heba Waly13c4d7e2019-11-17 21:04:40 +0000414
Jeff Kingce436972006-07-23 05:24:18 -0400415const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100416#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -0700417 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100418
Jeff Kingce436972006-07-23 05:24:18 -0400419
John Keepingf1922232013-02-07 20:15:26 +0000420const char *diff_line_prefix(struct diff_options *);
421
422
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200423extern const char mime_boundary_leader[];
424
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200425struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 10:31:06 -0700426 struct combine_diff_path *p, const struct object_id *oid,
427 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-07 01:46:26 +0400428 struct strbuf *base, struct diff_options *opt);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200429int diff_tree_oid(const struct object_id *old_oid,
430 const struct object_id *new_oid,
431 const char *base, struct diff_options *opt);
432int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
433 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700434
Junio C Hamanoea726d02006-01-28 00:03:38 -0800435struct combine_diff_path {
436 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800437 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800438 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000439 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800440 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800441 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800442 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000443 struct object_id oid;
Elijah Newrend76ce4f2019-02-07 17:12:46 -0800444 struct strbuf path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800445 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800446};
Junio C Hamano2454c962006-02-06 12:53:07 -0800447#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 06:21:30 -0500448 st_add4(sizeof(struct combine_diff_path), (l), 1, \
449 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 00:03:38 -0800450
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200451void show_combined_diff(struct combine_diff_path *elem, int num_parent,
452 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800453
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200454void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700455
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200456void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800457
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700458void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
459
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200460int diff_can_quit_early(struct diff_options *);
Junio C Hamano28b92642011-05-31 09:14:17 -0700461
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200462void diff_addremove(struct diff_options *,
463 int addremove,
464 unsigned mode,
465 const struct object_id *oid,
466 int oid_valid,
467 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700468
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200469void diff_change(struct diff_options *,
470 unsigned mode1, unsigned mode2,
471 const struct object_id *old_oid,
472 const struct object_id *new_oid,
473 int old_oid_valid, int new_oid_valid,
474 const char *fullpath,
475 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700476
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200477struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700478
Daniel Ferreirae4cb6592019-11-13 12:40:58 +0000479void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,
480 struct diff_queue_struct *q);
481void free_diffstat_info(struct diffstat_t *diffstat);
482
Junio C Hamano19feebc2005-05-27 15:54:37 -0700483#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700484#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700485
Matthieu Moydea007f2010-08-05 10:22:52 +0200486/*
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +0100487 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 10:22:52 +0200488 * (--option=value) and separate form (--option value).
489 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200490int parse_long_opt(const char *opt, const char **argv,
491 const char **optarg);
Matthieu Moydea007f2010-08-05 10:22:52 +0200492
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200493int git_diff_basic_config(const char *var, const char *value, void *cb);
494int git_diff_heuristic_config(const char *var, const char *value, void *cb);
495void init_diff_ui_defaults(void);
496int git_diff_ui_config(const char *var, const char *value, void *cb);
Nguyễn Thái Ngọc Duye6757652018-09-21 17:57:24 +0200497#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
498#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
499#endif
500void repo_diff_setup(struct repository *, struct diff_options *);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200501int diff_opt_parse(struct diff_options *, const char **, int, const char *);
502void diff_setup_done(struct diff_options *);
503int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-25 18:22:47 -0700504
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700505#define DIFF_DETECT_RENAME 1
506#define DIFF_DETECT_COPY 2
507
Junio C Hamano367cec12005-05-27 15:55:28 -0700508#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200509#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700510
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700511#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
512#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 14:50:42 -0800513#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700514
Stefan Beller15af58c2018-01-04 14:50:42 -0800515#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
516 DIFF_PICKAXE_KIND_G | \
517 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 14:50:41 -0800518
Stefan Bellerc1ddc462018-01-04 14:50:40 -0800519#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700520
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200521void diffcore_std(struct diff_options *);
Jeff King784c0da2019-02-14 00:48:03 -0500522void diffcore_fix_diff_index(void);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700523
Junio C Hamanodda2d792005-07-13 12:52:35 -0700524#define COMMON_DIFF_OPTIONS_HELP \
525"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700526" -z output diff-raw with lines terminated with NUL.\n" \
527" -p output patch format.\n" \
528" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200529" --patch-with-raw\n" \
530" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200531" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700532" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200533" --patch-with-stat\n" \
534" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700535" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700536" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800537" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800538" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700539" -R swap input file pairs.\n" \
540" -B detect complete rewrites.\n" \
541" -M detect renames.\n" \
542" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700543" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700544" try unchanged files as candidate for copy detection.\n" \
545" -l<n> limit rename attempts up to <n> paths.\n" \
546" -O<file> reorder diffs according to the <file>.\n" \
547" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700548" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200549" show all files diff when -S is used and hit is found.\n" \
550" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700551
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200552int diff_queue_is_empty(void);
553void diff_flush(struct diff_options*);
554void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-25 18:22:47 -0700555
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700556/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700557#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700558#define DIFF_STATUS_COPIED 'C'
559#define DIFF_STATUS_DELETED 'D'
560#define DIFF_STATUS_MODIFIED 'M'
561#define DIFF_STATUS_RENAMED 'R'
562#define DIFF_STATUS_TYPE_CHANGED 'T'
563#define DIFF_STATUS_UNKNOWN 'X'
564#define DIFF_STATUS_UNMERGED 'U'
565
566/* these are not diff-raw status letters proper, but used by
567 * diffcore-filter insn to specify additional restrictions.
568 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700569#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700570#define DIFF_STATUS_FILTER_BROKEN 'B'
571
Jeff Kingd5e3b012016-10-20 02:19:43 -0400572/*
573 * This is different from find_unique_abbrev() in that
574 * it stuffs the result with dots for alignment.
575 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200576const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800577
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800578/* do not report anything on removed paths */
579#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800580/* report racily-clean paths as modified */
581#define DIFF_RACY_IS_MODIFIED 02
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200582int run_diff_files(struct rev_info *revs, unsigned int option);
583int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700584
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200585int do_diff_cache(const struct object_id *, struct diff_options *);
Stephen Boyda8f68552019-04-26 16:51:57 -0700586int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
brian m. carlson36261e42019-08-18 20:04:03 +0000587void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200588
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200589int diff_result_code(struct diff_options *, int);
Junio C Hamanoda31b352007-12-13 23:40:27 -0800590
Junio C Hamanodcd6a8c2019-04-25 16:41:12 +0900591int diff_no_index(struct rev_info *,
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700592 int implicit_no_index, int, const char **);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700593
Nguyễn Thái Ngọc Duyffc00a42018-11-10 06:49:04 +0100594int index_differs_from(struct repository *r, const char *def,
595 const struct diff_flags *flags,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200596 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100597
Jeff Kinga64e6a42016-02-22 13:28:54 -0500598/*
599 * Fill the contents of the filespec "df", respecting any textconv defined by
600 * its userdiff driver. The "driver" parameter must come from a
601 * previous call to get_textconv(), and therefore should either be NULL or have
602 * textconv enabled.
603 *
604 * Note that the memory ownership of the resulting buffer depends on whether
605 * the driver field is NULL. If it is, then the memory belongs to the filespec
606 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
607 * that should be freed by the caller.
608 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200609size_t fill_textconv(struct repository *r,
610 struct userdiff_driver *driver,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200611 struct diff_filespec *df,
612 char **outbuf);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200613
Jeff Kinga64e6a42016-02-22 13:28:54 -0500614/*
615 * Look up the userdiff driver for the given filespec, and return it if
616 * and only if it has textconv enabled (otherwise return NULL). The result
617 * can be passed to fill_textconv().
618 */
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +0100619struct userdiff_driver *get_textconv(struct repository *r,
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +0200620 struct diff_filespec *one);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200621
Jeff Smith3a35cb22017-05-24 00:15:10 -0500622/*
623 * Prepare diff_filespec and convert it using diff textconv API
624 * if the textconv driver exists.
625 * Return 1 if the conversion succeeds, 0 otherwise.
626 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200627int textconv_object(struct repository *repo,
628 const char *path,
629 unsigned mode,
630 const struct object_id *oid, int oid_valid,
631 char **buf, unsigned long *buf_size);
Jeff Smith3a35cb22017-05-24 00:15:10 -0500632
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200633int parse_rename_score(const char **cp_p);
Kevin Ballard10ae7522010-09-27 16:58:25 -0700634
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200635long parse_algorithm_value(const char *value);
Michal Privoznik07924d42013-01-16 08:51:58 +0100636
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200637void print_stat_summary(FILE *fp, int files,
638 int insertions, int deletions);
639void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700640
Junio C Hamano86436c22005-04-25 18:22:47 -0700641#endif /* DIFF_H */