blob: b20cbcc0914250de4921310d16d58ada4acb7984 [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
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070012struct combine_diff_path;
13struct commit;
14struct diff_filespec;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070015struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040016struct diff_queue_struct;
brian m. carlson910650d2017-03-31 01:40:00 +000017struct oid_array;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +070018struct option;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +020019struct repository;
Nguyễn Thái Ngọc Duy4a1b13a2019-01-27 07:35:29 +070020struct rev_info;
21struct strbuf;
22struct userdiff_driver;
Kirill Smelkov72441af2014-04-07 01:46:26 +040023
24typedef int (*pathchange_fn_t)(struct diff_options *options,
25 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070026
27typedef void (*change_fn_t)(struct diff_options *options,
28 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 10:30:49 -070029 const struct object_id *old_oid,
30 const struct object_id *new_oid,
31 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010032 const char *fullpath,
33 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070034
35typedef void (*add_remove_fn_t)(struct diff_options *options,
36 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -070037 const struct object_id *oid,
38 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010039 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070040
Jeff King04245582006-09-07 02:35:42 -040041typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
42 struct diff_options *options, void *data);
43
Bo Yanga3c158d2010-05-26 15:08:02 +080044typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
45
Timo Hirvonenc6744342006-06-24 20:21:53 +030046#define DIFF_FORMAT_RAW 0x0001
47#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -070048#define DIFF_FORMAT_NUMSTAT 0x0004
49#define DIFF_FORMAT_SUMMARY 0x0008
50#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -050051#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 13:26:31 -080052#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 20:21:53 +030053
54/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070055#define DIFF_FORMAT_NAME 0x0100
56#define DIFF_FORMAT_NAME_STATUS 0x0200
57#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +030058
59/* Same as output_format = 0 but we know that -s flag was given
60 * and we should not give default value to output_format.
61 */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070062#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +030063
Junio C Hamano74e2abe2006-10-12 03:01:00 -070064#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -040065
Brandon Williams02f2f562017-10-31 11:19:05 -070066#define DIFF_FLAGS_INIT { 0 }
67struct diff_flags {
Nguyễn Thái Ngọc Duy2b393ef2019-01-27 07:35:30 +070068 unsigned recursive;
69 unsigned tree_in_recursive;
70 unsigned binary;
71 unsigned text;
72 unsigned full_index;
73 unsigned silent_on_remove;
74 unsigned find_copies_harder;
75 unsigned follow_renames;
76 unsigned rename_empty;
77 unsigned has_changes;
78 unsigned quick;
79 unsigned no_index;
80 unsigned allow_external;
81 unsigned exit_with_status;
82 unsigned reverse_diff;
83 unsigned check_failed;
84 unsigned relative_name;
85 unsigned ignore_submodules;
86 unsigned dirstat_cumulative;
87 unsigned dirstat_by_file;
88 unsigned allow_textconv;
89 unsigned textconv_set_via_cmdline;
90 unsigned diff_from_contents;
91 unsigned dirty_submodules;
92 unsigned ignore_untracked_in_submodules;
93 unsigned ignore_dirty_submodules;
94 unsigned override_submodule_config;
95 unsigned dirstat_by_line;
96 unsigned funccontext;
97 unsigned default_follow_renames;
98 unsigned stat_with_summary;
99 unsigned suppress_diff_headers;
100 unsigned dual_color_diffed_diffs;
Brandon Williams02f2f562017-10-31 11:19:05 -0700101};
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200102
Brandon Williams02f2f562017-10-31 11:19:05 -0700103static inline void diff_flags_or(struct diff_flags *a,
104 const struct diff_flags *b)
105{
106 char *tmp_a = (char *)a;
107 const char *tmp_b = (const char *)b;
108 int i;
109
110 for (i = 0; i < sizeof(struct diff_flags); i++)
111 tmp_a[i] |= tmp_b[i];
112}
113
Keith Cascio628d5c22009-02-16 19:26:49 -0800114#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
115#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
116#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100117
Junio C Hamano307ab202012-02-19 15:36:55 -0800118#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
119
Thomas Rast882749a2010-04-14 17:59:06 +0200120enum diff_words_type {
121 DIFF_WORDS_NONE = 0,
122 DIFF_WORDS_PORCELAIN,
123 DIFF_WORDS_PLAIN,
124 DIFF_WORDS_COLOR
125};
126
Jacob Keller61cfbc02016-08-31 16:27:21 -0700127enum diff_submodule_format {
128 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700129 DIFF_SUBMODULE_LOG,
130 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 16:27:21 -0700131};
132
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700133struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700134 const char *orderfile;
135 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800136 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000137 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 16:27:20 -0700138 const char *line_prefix;
139 size_t line_prefix_length;
Brandon Williams02f2f562017-10-31 11:19:05 -0700140 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700141
142 /* diff-filter bits */
143 unsigned int filter;
144
Jeff Kingf1c96262011-08-17 22:03:12 -0700145 int use_color;
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700146 int context;
René Scharfe6d0e6742008-12-28 19:45:32 +0100147 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700148 int break_opt;
149 int detect_rename;
Junio C Hamano467ddc12011-02-28 16:11:55 -0800150 int irreversible_delete;
Junio C Hamanofb132272007-08-03 13:33:31 -0700151 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700152 int line_termination;
153 int output_format;
Stefan Beller929ed702018-01-04 14:50:39 -0800154 unsigned pickaxe_opts;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700155 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700156 int rename_limit;
Jeff Kingbf0ab102011-02-19 05:20:51 -0500157 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800158 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 04:51:16 -0500159 int show_rename_progress;
Johan Herland712d2c72011-04-29 11:36:20 +0200160 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700161 int setup;
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800162 int abbrev;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700163 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 10:11:28 -0700164/* white-space error highlighting */
Stefan Beller091f8e22017-06-29 17:06:53 -0700165#define WSEH_NEW (1<<12)
166#define WSEH_CONTEXT (1<<13)
167#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 10:11:28 -0700168 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800169 const char *prefix;
170 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200171 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 17:40:23 +0200172 long xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700173
Jonathan Tan2477ab22017-11-27 11:47:47 -0800174 /* see Documentation/diff-options.txt */
175 char **anchors;
176 size_t anchors_nr, anchors_alloc;
177
Junio C Hamanoa2540022006-09-26 18:53:02 -0700178 int stat_width;
179 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +0100180 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +0200181 int stat_count;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100182 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200183 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 16:27:21 -0700184 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700185
Stefan Beller15af58c2018-01-04 14:50:42 -0800186 struct oidset *objfind;
187
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100188 /* this is set by diffcore for DIFF_FORMAT_PATCH */
189 int found_changes;
190
Junio C Hamano44c48a92010-08-13 12:17:45 -0700191 /* to support internal diff recursion by --follow hack*/
192 int found_follow;
193
Junio C Hamano6c374002013-05-10 17:10:11 +0200194 void (*set_default)(struct diff_options *);
195
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400196 FILE *file;
197 int close_file;
198
Stefan Beller7648b792018-08-17 13:43:52 -0700199#define OUTPUT_INDICATOR_NEW 0
200#define OUTPUT_INDICATOR_OLD 1
201#define OUTPUT_INDICATOR_CONTEXT 2
202 char output_indicators[3];
203
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700204 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-07 01:46:26 +0400205 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700206 change_fn_t change;
207 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 11:27:45 -0400208 void *change_fn_data;
Jeff King04245582006-09-07 02:35:42 -0400209 diff_format_fn_t format_callback;
210 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800211 diff_prefix_fn_t output_prefix;
212 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +1100213
214 int diff_path_counter;
Stefan Bellere6e045f2017-06-29 17:07:06 -0700215
216 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700217 enum {
218 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 13:53:08 -0700219 COLOR_MOVED_PLAIN = 1,
Stefan Beller51da15e2018-07-16 16:05:39 -0700220 COLOR_MOVED_BLOCKS = 2,
221 COLOR_MOVED_ZEBRA = 3,
222 COLOR_MOVED_ZEBRA_DIM = 4,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700223 } color_moved;
224 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-15 18:27:39 -0700225 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700226
227 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
228 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
Stefan Bellerd173e792018-11-13 13:33:57 -0800229 #define COLOR_MOVED_WS_ERROR (1<<0)
230 unsigned color_moved_ws_handling;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200231
232 struct repository *repo;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +0700233 struct option *parseopts;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700234};
235
Nguyễn Thái Ngọc Duycdb53302019-03-24 15:20:14 +0700236unsigned diff_filter_bit(char status);
237
Stefan Bellerf3597132017-06-29 17:07:00 -0700238void diff_emit_submodule_del(struct diff_options *o, const char *line);
239void diff_emit_submodule_add(struct diff_options *o, const char *line);
240void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
241void diff_emit_submodule_modified(struct diff_options *o, const char *path);
242void diff_emit_submodule_header(struct diff_options *o, const char *header);
243void diff_emit_submodule_error(struct diff_options *o, const char *err);
244void diff_emit_submodule_pipethrough(struct diff_options *o,
245 const char *line, int len);
246
Jeff Kingce436972006-07-23 05:24:18 -0400247enum color_diff {
248 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 16:48:46 -0400249 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 05:24:18 -0400250 DIFF_METAINFO = 2,
251 DIFF_FRAGINFO = 3,
252 DIFF_FILE_OLD = 4,
253 DIFF_FILE_NEW = 5,
254 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700255 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700256 DIFF_FUNCINFO = 8,
257 DIFF_FILE_OLD_MOVED = 9,
258 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 13:53:09 -0700259 DIFF_FILE_OLD_MOVED_DIM = 11,
260 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
261 DIFF_FILE_NEW_MOVED = 13,
262 DIFF_FILE_NEW_MOVED_ALT = 14,
263 DIFF_FILE_NEW_MOVED_DIM = 15,
Johannes Schindelina7be92a2018-08-13 04:33:32 -0700264 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
265 DIFF_CONTEXT_DIM = 17,
266 DIFF_FILE_OLD_DIM = 18,
267 DIFF_FILE_NEW_DIM = 19,
268 DIFF_CONTEXT_BOLD = 20,
269 DIFF_FILE_OLD_BOLD = 21,
270 DIFF_FILE_NEW_BOLD = 22,
Jeff Kingce436972006-07-23 05:24:18 -0400271};
272const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100273#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -0700274 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100275
Jeff Kingce436972006-07-23 05:24:18 -0400276
John Keepingf1922232013-02-07 20:15:26 +0000277const char *diff_line_prefix(struct diff_options *);
278
279
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200280extern const char mime_boundary_leader[];
281
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200282struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 10:31:06 -0700283 struct combine_diff_path *p, const struct object_id *oid,
284 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-07 01:46:26 +0400285 struct strbuf *base, struct diff_options *opt);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200286int diff_tree_oid(const struct object_id *old_oid,
287 const struct object_id *new_oid,
288 const char *base, struct diff_options *opt);
289int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
290 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700291
Junio C Hamanoea726d02006-01-28 00:03:38 -0800292struct combine_diff_path {
293 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800294 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800295 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000296 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800297 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800298 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800299 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000300 struct object_id oid;
Elijah Newrend76ce4f2019-02-07 17:12:46 -0800301 struct strbuf path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800302 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800303};
Junio C Hamano2454c962006-02-06 12:53:07 -0800304#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 06:21:30 -0500305 st_add4(sizeof(struct combine_diff_path), (l), 1, \
306 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 00:03:38 -0800307
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200308void show_combined_diff(struct combine_diff_path *elem, int num_parent,
309 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800310
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200311void 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 -0700312
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200313void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800314
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700315void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
316
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200317int diff_can_quit_early(struct diff_options *);
Junio C Hamano28b92642011-05-31 09:14:17 -0700318
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200319void diff_addremove(struct diff_options *,
320 int addremove,
321 unsigned mode,
322 const struct object_id *oid,
323 int oid_valid,
324 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700325
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200326void diff_change(struct diff_options *,
327 unsigned mode1, unsigned mode2,
328 const struct object_id *old_oid,
329 const struct object_id *new_oid,
330 int old_oid_valid, int new_oid_valid,
331 const char *fullpath,
332 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700333
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200334struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700335
Junio C Hamano19feebc2005-05-27 15:54:37 -0700336#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700337#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700338
Matthieu Moydea007f2010-08-05 10:22:52 +0200339/*
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +0100340 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 10:22:52 +0200341 * (--option=value) and separate form (--option value).
342 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200343int parse_long_opt(const char *opt, const char **argv,
344 const char **optarg);
Matthieu Moydea007f2010-08-05 10:22:52 +0200345
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200346int git_diff_basic_config(const char *var, const char *value, void *cb);
347int git_diff_heuristic_config(const char *var, const char *value, void *cb);
348void init_diff_ui_defaults(void);
349int git_diff_ui_config(const char *var, const char *value, void *cb);
Nguyễn Thái Ngọc Duye6757652018-09-21 17:57:24 +0200350#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
351#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
352#endif
353void repo_diff_setup(struct repository *, struct diff_options *);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200354int diff_opt_parse(struct diff_options *, const char **, int, const char *);
355void diff_setup_done(struct diff_options *);
356int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-25 18:22:47 -0700357
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700358#define DIFF_DETECT_RENAME 1
359#define DIFF_DETECT_COPY 2
360
Junio C Hamano367cec12005-05-27 15:55:28 -0700361#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200362#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700363
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700364#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
365#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 14:50:42 -0800366#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700367
Stefan Beller15af58c2018-01-04 14:50:42 -0800368#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
369 DIFF_PICKAXE_KIND_G | \
370 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 14:50:41 -0800371
Stefan Bellerc1ddc462018-01-04 14:50:40 -0800372#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700373
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200374void diffcore_std(struct diff_options *);
Jeff King784c0da2019-02-14 00:48:03 -0500375void diffcore_fix_diff_index(void);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700376
Junio C Hamanodda2d792005-07-13 12:52:35 -0700377#define COMMON_DIFF_OPTIONS_HELP \
378"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700379" -z output diff-raw with lines terminated with NUL.\n" \
380" -p output patch format.\n" \
381" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200382" --patch-with-raw\n" \
383" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200384" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700385" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200386" --patch-with-stat\n" \
387" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700388" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700389" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800390" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800391" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700392" -R swap input file pairs.\n" \
393" -B detect complete rewrites.\n" \
394" -M detect renames.\n" \
395" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700396" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700397" try unchanged files as candidate for copy detection.\n" \
398" -l<n> limit rename attempts up to <n> paths.\n" \
399" -O<file> reorder diffs according to the <file>.\n" \
400" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700401" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200402" show all files diff when -S is used and hit is found.\n" \
403" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700404
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200405int diff_queue_is_empty(void);
406void diff_flush(struct diff_options*);
407void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-25 18:22:47 -0700408
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700409/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700410#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700411#define DIFF_STATUS_COPIED 'C'
412#define DIFF_STATUS_DELETED 'D'
413#define DIFF_STATUS_MODIFIED 'M'
414#define DIFF_STATUS_RENAMED 'R'
415#define DIFF_STATUS_TYPE_CHANGED 'T'
416#define DIFF_STATUS_UNKNOWN 'X'
417#define DIFF_STATUS_UNMERGED 'U'
418
419/* these are not diff-raw status letters proper, but used by
420 * diffcore-filter insn to specify additional restrictions.
421 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700422#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700423#define DIFF_STATUS_FILTER_BROKEN 'B'
424
Jeff Kingd5e3b012016-10-20 02:19:43 -0400425/*
426 * This is different from find_unique_abbrev() in that
427 * it stuffs the result with dots for alignment.
428 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200429const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800430
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800431/* do not report anything on removed paths */
432#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800433/* report racily-clean paths as modified */
434#define DIFF_RACY_IS_MODIFIED 02
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200435int run_diff_files(struct rev_info *revs, unsigned int option);
436int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700437
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200438int do_diff_cache(const struct object_id *, struct diff_options *);
439int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200440
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200441int diff_result_code(struct diff_options *, int);
Junio C Hamanoda31b352007-12-13 23:40:27 -0800442
Junio C Hamanodcd6a8c2019-04-25 16:41:12 +0900443int diff_no_index(struct rev_info *,
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700444 int implicit_no_index, int, const char **);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700445
Nguyễn Thái Ngọc Duyffc00a42018-11-10 06:49:04 +0100446int index_differs_from(struct repository *r, const char *def,
447 const struct diff_flags *flags,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200448 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100449
Jeff Kinga64e6a42016-02-22 13:28:54 -0500450/*
451 * Fill the contents of the filespec "df", respecting any textconv defined by
452 * its userdiff driver. The "driver" parameter must come from a
453 * previous call to get_textconv(), and therefore should either be NULL or have
454 * textconv enabled.
455 *
456 * Note that the memory ownership of the resulting buffer depends on whether
457 * the driver field is NULL. If it is, then the memory belongs to the filespec
458 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
459 * that should be freed by the caller.
460 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200461size_t fill_textconv(struct repository *r,
462 struct userdiff_driver *driver,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200463 struct diff_filespec *df,
464 char **outbuf);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200465
Jeff Kinga64e6a42016-02-22 13:28:54 -0500466/*
467 * Look up the userdiff driver for the given filespec, and return it if
468 * and only if it has textconv enabled (otherwise return NULL). The result
469 * can be passed to fill_textconv().
470 */
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +0100471struct userdiff_driver *get_textconv(struct repository *r,
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +0200472 struct diff_filespec *one);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200473
Jeff Smith3a35cb22017-05-24 00:15:10 -0500474/*
475 * Prepare diff_filespec and convert it using diff textconv API
476 * if the textconv driver exists.
477 * Return 1 if the conversion succeeds, 0 otherwise.
478 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +0200479int textconv_object(struct repository *repo,
480 const char *path,
481 unsigned mode,
482 const struct object_id *oid, int oid_valid,
483 char **buf, unsigned long *buf_size);
Jeff Smith3a35cb22017-05-24 00:15:10 -0500484
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200485int parse_rename_score(const char **cp_p);
Kevin Ballard10ae7522010-09-27 16:58:25 -0700486
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200487long parse_algorithm_value(const char *value);
Michal Privoznik07924d42013-01-16 08:51:58 +0100488
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200489void print_stat_summary(FILE *fp, int files,
490 int insertions, int deletions);
491void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700492
Junio C Hamano86436c22005-04-25 18:22:47 -0700493#endif /* DIFF_H */