blob: a30cc35ec3b4cb525340691a39ca88e89e379e4c [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
Linus Torvalds91539832006-04-17 11:59:32 -070012struct rev_info;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070013struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040014struct diff_queue_struct;
Bo Yanga3c158d2010-05-26 15:08:02 +080015struct strbuf;
Axel Bonneta788d7d2010-06-07 17:23:36 +020016struct diff_filespec;
17struct userdiff_driver;
brian m. carlson910650d2017-03-31 01:40:00 +000018struct oid_array;
René Scharfe82889292011-12-17 11:20:07 +010019struct commit;
Kirill Smelkov72441af2014-04-07 01:46:26 +040020struct combine_diff_path;
21
22typedef int (*pathchange_fn_t)(struct diff_options *options,
23 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070024
25typedef void (*change_fn_t)(struct diff_options *options,
26 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 10:30:49 -070027 const struct object_id *old_oid,
28 const struct object_id *new_oid,
29 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010030 const char *fullpath,
31 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070032
33typedef void (*add_remove_fn_t)(struct diff_options *options,
34 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -070035 const struct object_id *oid,
36 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010037 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070038
Jeff King04245582006-09-07 02:35:42 -040039typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
40 struct diff_options *options, void *data);
41
Bo Yanga3c158d2010-05-26 15:08:02 +080042typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
43
Timo Hirvonenc6744342006-06-24 20:21:53 +030044#define DIFF_FORMAT_RAW 0x0001
45#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -070046#define DIFF_FORMAT_NUMSTAT 0x0004
47#define DIFF_FORMAT_SUMMARY 0x0008
48#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -050049#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 13:26:31 -080050#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 20:21:53 +030051
52/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070053#define DIFF_FORMAT_NAME 0x0100
54#define DIFF_FORMAT_NAME_STATUS 0x0200
55#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +030056
57/* Same as output_format = 0 but we know that -s flag was given
58 * and we should not give default value to output_format.
59 */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070060#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +030061
Junio C Hamano74e2abe2006-10-12 03:01:00 -070062#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -040063
Brandon Williams02f2f562017-10-31 11:19:05 -070064#define DIFF_FLAGS_INIT { 0 }
65struct diff_flags {
Brandon Williams0d1e0e72017-10-31 11:19:11 -070066 unsigned recursive:1;
67 unsigned tree_in_recursive:1;
68 unsigned binary:1;
69 unsigned text:1;
70 unsigned full_index:1;
71 unsigned silent_on_remove:1;
72 unsigned find_copies_harder:1;
73 unsigned follow_renames:1;
74 unsigned rename_empty:1;
75 unsigned has_changes:1;
76 unsigned quick:1;
77 unsigned no_index:1;
78 unsigned allow_external:1;
79 unsigned exit_with_status:1;
80 unsigned reverse_diff:1;
81 unsigned check_failed:1;
82 unsigned relative_name:1;
83 unsigned ignore_submodules:1;
84 unsigned dirstat_cumulative:1;
85 unsigned dirstat_by_file:1;
86 unsigned allow_textconv:1;
87 unsigned textconv_set_via_cmdline:1;
88 unsigned diff_from_contents:1;
89 unsigned dirty_submodules:1;
90 unsigned ignore_untracked_in_submodules:1;
91 unsigned ignore_dirty_submodules:1;
92 unsigned override_submodule_config:1;
93 unsigned dirstat_by_line:1;
94 unsigned funccontext:1;
Brandon Williams0d1e0e72017-10-31 11:19:11 -070095 unsigned default_follow_renames:1;
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 21:09:59 +070096 unsigned stat_with_summary:1;
Johannes Schindelin1cdde292018-08-13 04:33:11 -070097 unsigned suppress_diff_headers:1;
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -070098 unsigned dual_color_diffed_diffs:1;
Brandon Williams02f2f562017-10-31 11:19:05 -070099};
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200100
Brandon Williams02f2f562017-10-31 11:19:05 -0700101static inline void diff_flags_or(struct diff_flags *a,
102 const struct diff_flags *b)
103{
104 char *tmp_a = (char *)a;
105 const char *tmp_b = (const char *)b;
106 int i;
107
108 for (i = 0; i < sizeof(struct diff_flags); i++)
109 tmp_a[i] |= tmp_b[i];
110}
111
Keith Cascio628d5c22009-02-16 19:26:49 -0800112#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
113#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
114#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100115
Junio C Hamano307ab202012-02-19 15:36:55 -0800116#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
117
Thomas Rast882749a2010-04-14 17:59:06 +0200118enum diff_words_type {
119 DIFF_WORDS_NONE = 0,
120 DIFF_WORDS_PORCELAIN,
121 DIFF_WORDS_PLAIN,
122 DIFF_WORDS_COLOR
123};
124
Jacob Keller61cfbc02016-08-31 16:27:21 -0700125enum diff_submodule_format {
126 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700127 DIFF_SUBMODULE_LOG,
128 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 16:27:21 -0700129};
130
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700131struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700132 const char *orderfile;
133 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800134 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000135 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 16:27:20 -0700136 const char *line_prefix;
137 size_t line_prefix_length;
Brandon Williams02f2f562017-10-31 11:19:05 -0700138 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700139
140 /* diff-filter bits */
141 unsigned int filter;
142
Jeff Kingf1c96262011-08-17 22:03:12 -0700143 int use_color;
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700144 int context;
René Scharfe6d0e6742008-12-28 19:45:32 +0100145 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700146 int break_opt;
147 int detect_rename;
Junio C Hamano467ddc12011-02-28 16:11:55 -0800148 int irreversible_delete;
Junio C Hamanofb132272007-08-03 13:33:31 -0700149 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700150 int line_termination;
151 int output_format;
Stefan Beller929ed702018-01-04 14:50:39 -0800152 unsigned pickaxe_opts;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700153 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700154 int rename_limit;
Jeff Kingbf0ab102011-02-19 05:20:51 -0500155 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800156 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 04:51:16 -0500157 int show_rename_progress;
Johan Herland712d2c72011-04-29 11:36:20 +0200158 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700159 int setup;
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800160 int abbrev;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700161 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 10:11:28 -0700162/* white-space error highlighting */
Stefan Beller091f8e22017-06-29 17:06:53 -0700163#define WSEH_NEW (1<<12)
164#define WSEH_CONTEXT (1<<13)
165#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 10:11:28 -0700166 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800167 const char *prefix;
168 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200169 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 17:40:23 +0200170 long xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700171
Jonathan Tan2477ab22017-11-27 11:47:47 -0800172 /* see Documentation/diff-options.txt */
173 char **anchors;
174 size_t anchors_nr, anchors_alloc;
175
Junio C Hamanoa2540022006-09-26 18:53:02 -0700176 int stat_width;
177 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +0100178 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +0200179 int stat_count;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100180 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200181 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 16:27:21 -0700182 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700183
Stefan Beller15af58c2018-01-04 14:50:42 -0800184 struct oidset *objfind;
185
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100186 /* this is set by diffcore for DIFF_FORMAT_PATCH */
187 int found_changes;
188
Junio C Hamano44c48a92010-08-13 12:17:45 -0700189 /* to support internal diff recursion by --follow hack*/
190 int found_follow;
191
Junio C Hamano6c374002013-05-10 17:10:11 +0200192 void (*set_default)(struct diff_options *);
193
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400194 FILE *file;
195 int close_file;
196
Stefan Beller7648b792018-08-17 13:43:52 -0700197#define OUTPUT_INDICATOR_NEW 0
198#define OUTPUT_INDICATOR_OLD 1
199#define OUTPUT_INDICATOR_CONTEXT 2
200 char output_indicators[3];
201
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700202 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-07 01:46:26 +0400203 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700204 change_fn_t change;
205 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 11:27:45 -0400206 void *change_fn_data;
Jeff King04245582006-09-07 02:35:42 -0400207 diff_format_fn_t format_callback;
208 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800209 diff_prefix_fn_t output_prefix;
210 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +1100211
212 int diff_path_counter;
Stefan Bellere6e045f2017-06-29 17:07:06 -0700213
214 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700215 enum {
216 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 13:53:08 -0700217 COLOR_MOVED_PLAIN = 1,
Stefan Beller51da15e2018-07-16 16:05:39 -0700218 COLOR_MOVED_BLOCKS = 2,
219 COLOR_MOVED_ZEBRA = 3,
220 COLOR_MOVED_ZEBRA_DIM = 4,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700221 } color_moved;
222 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-15 18:27:39 -0700223 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700224
225 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
226 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
Stefan Bellerb3095712018-07-16 16:05:40 -0700227 int color_moved_ws_handling;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700228};
229
Stefan Bellerf3597132017-06-29 17:07:00 -0700230void diff_emit_submodule_del(struct diff_options *o, const char *line);
231void diff_emit_submodule_add(struct diff_options *o, const char *line);
232void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
233void diff_emit_submodule_modified(struct diff_options *o, const char *path);
234void diff_emit_submodule_header(struct diff_options *o, const char *header);
235void diff_emit_submodule_error(struct diff_options *o, const char *err);
236void diff_emit_submodule_pipethrough(struct diff_options *o,
237 const char *line, int len);
238
Jeff Kingce436972006-07-23 05:24:18 -0400239enum color_diff {
240 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 16:48:46 -0400241 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 05:24:18 -0400242 DIFF_METAINFO = 2,
243 DIFF_FRAGINFO = 3,
244 DIFF_FILE_OLD = 4,
245 DIFF_FILE_NEW = 5,
246 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700247 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700248 DIFF_FUNCINFO = 8,
249 DIFF_FILE_OLD_MOVED = 9,
250 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 13:53:09 -0700251 DIFF_FILE_OLD_MOVED_DIM = 11,
252 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
253 DIFF_FILE_NEW_MOVED = 13,
254 DIFF_FILE_NEW_MOVED_ALT = 14,
255 DIFF_FILE_NEW_MOVED_DIM = 15,
Johannes Schindelina7be92a2018-08-13 04:33:32 -0700256 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
257 DIFF_CONTEXT_DIM = 17,
258 DIFF_FILE_OLD_DIM = 18,
259 DIFF_FILE_NEW_DIM = 19,
260 DIFF_CONTEXT_BOLD = 20,
261 DIFF_FILE_OLD_BOLD = 21,
262 DIFF_FILE_NEW_BOLD = 22,
Jeff Kingce436972006-07-23 05:24:18 -0400263};
264const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100265#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -0700266 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100267
Jeff Kingce436972006-07-23 05:24:18 -0400268
John Keepingf1922232013-02-07 20:15:26 +0000269const char *diff_line_prefix(struct diff_options *);
270
271
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200272extern const char mime_boundary_leader[];
273
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200274struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 10:31:06 -0700275 struct combine_diff_path *p, const struct object_id *oid,
276 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-07 01:46:26 +0400277 struct strbuf *base, struct diff_options *opt);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200278int diff_tree_oid(const struct object_id *old_oid,
279 const struct object_id *new_oid,
280 const char *base, struct diff_options *opt);
281int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
282 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700283
Junio C Hamanoea726d02006-01-28 00:03:38 -0800284struct combine_diff_path {
285 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800286 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800287 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000288 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800289 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800290 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800291 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000292 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800293 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800294};
Junio C Hamano2454c962006-02-06 12:53:07 -0800295#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 06:21:30 -0500296 st_add4(sizeof(struct combine_diff_path), (l), 1, \
297 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 00:03:38 -0800298
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200299void show_combined_diff(struct combine_diff_path *elem, int num_parent,
300 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800301
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200302void 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 -0700303
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200304void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800305
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700306void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
307
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200308int diff_can_quit_early(struct diff_options *);
Junio C Hamano28b92642011-05-31 09:14:17 -0700309
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200310void diff_addremove(struct diff_options *,
311 int addremove,
312 unsigned mode,
313 const struct object_id *oid,
314 int oid_valid,
315 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700316
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200317void diff_change(struct diff_options *,
318 unsigned mode1, unsigned mode2,
319 const struct object_id *old_oid,
320 const struct object_id *new_oid,
321 int old_oid_valid, int new_oid_valid,
322 const char *fullpath,
323 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700324
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200325struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700326
Junio C Hamano19feebc2005-05-27 15:54:37 -0700327#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700328#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700329
Matthieu Moydea007f2010-08-05 10:22:52 +0200330/*
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +0100331 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 10:22:52 +0200332 * (--option=value) and separate form (--option value).
333 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200334int parse_long_opt(const char *opt, const char **argv,
335 const char **optarg);
Matthieu Moydea007f2010-08-05 10:22:52 +0200336
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200337int git_diff_basic_config(const char *var, const char *value, void *cb);
338int git_diff_heuristic_config(const char *var, const char *value, void *cb);
339void init_diff_ui_defaults(void);
340int git_diff_ui_config(const char *var, const char *value, void *cb);
341void diff_setup(struct diff_options *);
342int diff_opt_parse(struct diff_options *, const char **, int, const char *);
343void diff_setup_done(struct diff_options *);
344int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-25 18:22:47 -0700345
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700346#define DIFF_DETECT_RENAME 1
347#define DIFF_DETECT_COPY 2
348
Junio C Hamano367cec12005-05-27 15:55:28 -0700349#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200350#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700351
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700352#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
353#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 14:50:42 -0800354#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700355
Stefan Beller15af58c2018-01-04 14:50:42 -0800356#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
357 DIFF_PICKAXE_KIND_G | \
358 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 14:50:41 -0800359
Stefan Bellerc1ddc462018-01-04 14:50:40 -0800360#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700361
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200362void diffcore_std(struct diff_options *);
363void diffcore_fix_diff_index(struct diff_options *);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700364
Junio C Hamanodda2d792005-07-13 12:52:35 -0700365#define COMMON_DIFF_OPTIONS_HELP \
366"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700367" -z output diff-raw with lines terminated with NUL.\n" \
368" -p output patch format.\n" \
369" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200370" --patch-with-raw\n" \
371" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200372" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700373" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200374" --patch-with-stat\n" \
375" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700376" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700377" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800378" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800379" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700380" -R swap input file pairs.\n" \
381" -B detect complete rewrites.\n" \
382" -M detect renames.\n" \
383" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700384" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700385" try unchanged files as candidate for copy detection.\n" \
386" -l<n> limit rename attempts up to <n> paths.\n" \
387" -O<file> reorder diffs according to the <file>.\n" \
388" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700389" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200390" show all files diff when -S is used and hit is found.\n" \
391" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700392
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200393int diff_queue_is_empty(void);
394void diff_flush(struct diff_options*);
395void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-25 18:22:47 -0700396
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700397/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700398#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700399#define DIFF_STATUS_COPIED 'C'
400#define DIFF_STATUS_DELETED 'D'
401#define DIFF_STATUS_MODIFIED 'M'
402#define DIFF_STATUS_RENAMED 'R'
403#define DIFF_STATUS_TYPE_CHANGED 'T'
404#define DIFF_STATUS_UNKNOWN 'X'
405#define DIFF_STATUS_UNMERGED 'U'
406
407/* these are not diff-raw status letters proper, but used by
408 * diffcore-filter insn to specify additional restrictions.
409 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700410#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700411#define DIFF_STATUS_FILTER_BROKEN 'B'
412
Jeff Kingd5e3b012016-10-20 02:19:43 -0400413/*
414 * This is different from find_unique_abbrev() in that
415 * it stuffs the result with dots for alignment.
416 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200417const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800418
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800419/* do not report anything on removed paths */
420#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800421/* report racily-clean paths as modified */
422#define DIFF_RACY_IS_MODIFIED 02
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200423int run_diff_files(struct rev_info *revs, unsigned int option);
424int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700425
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200426int do_diff_cache(const struct object_id *, struct diff_options *);
427int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200428
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200429int diff_result_code(struct diff_options *, int);
Junio C Hamanoda31b352007-12-13 23:40:27 -0800430
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200431void diff_no_index(struct rev_info *, int, const char **);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700432
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200433int index_differs_from(const char *def, const struct diff_flags *flags,
434 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100435
Jeff Kinga64e6a42016-02-22 13:28:54 -0500436/*
437 * Fill the contents of the filespec "df", respecting any textconv defined by
438 * its userdiff driver. The "driver" parameter must come from a
439 * previous call to get_textconv(), and therefore should either be NULL or have
440 * textconv enabled.
441 *
442 * Note that the memory ownership of the resulting buffer depends on whether
443 * the driver field is NULL. If it is, then the memory belongs to the filespec
444 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
445 * that should be freed by the caller.
446 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200447size_t fill_textconv(struct userdiff_driver *driver,
448 struct diff_filespec *df,
449 char **outbuf);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200450
Jeff Kinga64e6a42016-02-22 13:28:54 -0500451/*
452 * Look up the userdiff driver for the given filespec, and return it if
453 * and only if it has textconv enabled (otherwise return NULL). The result
454 * can be passed to fill_textconv().
455 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200456struct userdiff_driver *get_textconv(struct diff_filespec *one);
Axel Bonneta788d7d2010-06-07 17:23:36 +0200457
Jeff Smith3a35cb22017-05-24 00:15:10 -0500458/*
459 * Prepare diff_filespec and convert it using diff textconv API
460 * if the textconv driver exists.
461 * Return 1 if the conversion succeeds, 0 otherwise.
462 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200463int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);
Jeff Smith3a35cb22017-05-24 00:15:10 -0500464
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200465int parse_rename_score(const char **cp_p);
Kevin Ballard10ae7522010-09-27 16:58:25 -0700466
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200467long parse_algorithm_value(const char *value);
Michal Privoznik07924d42013-01-16 08:51:58 +0100468
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 11:20:26 +0200469void print_stat_summary(FILE *fp, int files,
470 int insertions, int deletions);
471void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700472
Junio C Hamano86436c22005-04-25 18:22:47 -0700473#endif /* DIFF_H */