blob: dedac472ca5959bb5ff17888a54042ac75678631 [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;
Brandon Williams02f2f562017-10-31 11:19:05 -070097};
Johannes Schindelin752c0c22009-10-19 14:38:32 +020098
Brandon Williams02f2f562017-10-31 11:19:05 -070099static inline void diff_flags_or(struct diff_flags *a,
100 const struct diff_flags *b)
101{
102 char *tmp_a = (char *)a;
103 const char *tmp_b = (const char *)b;
104 int i;
105
106 for (i = 0; i < sizeof(struct diff_flags); i++)
107 tmp_a[i] |= tmp_b[i];
108}
109
Keith Cascio628d5c22009-02-16 19:26:49 -0800110#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
111#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
112#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100113
Junio C Hamano307ab202012-02-19 15:36:55 -0800114#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
115
Thomas Rast882749a2010-04-14 17:59:06 +0200116enum diff_words_type {
117 DIFF_WORDS_NONE = 0,
118 DIFF_WORDS_PORCELAIN,
119 DIFF_WORDS_PLAIN,
120 DIFF_WORDS_COLOR
121};
122
Jacob Keller61cfbc02016-08-31 16:27:21 -0700123enum diff_submodule_format {
124 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700125 DIFF_SUBMODULE_LOG,
126 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 16:27:21 -0700127};
128
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700129struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700130 const char *orderfile;
131 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800132 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000133 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 16:27:20 -0700134 const char *line_prefix;
135 size_t line_prefix_length;
Brandon Williams02f2f562017-10-31 11:19:05 -0700136 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -0700137
138 /* diff-filter bits */
139 unsigned int filter;
140
Jeff Kingf1c96262011-08-17 22:03:12 -0700141 int use_color;
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700142 int context;
René Scharfe6d0e6742008-12-28 19:45:32 +0100143 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700144 int break_opt;
145 int detect_rename;
Junio C Hamano467ddc12011-02-28 16:11:55 -0800146 int irreversible_delete;
Junio C Hamanofb132272007-08-03 13:33:31 -0700147 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700148 int line_termination;
149 int output_format;
Stefan Beller929ed702018-01-04 14:50:39 -0800150 unsigned pickaxe_opts;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700151 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700152 int rename_limit;
Jeff Kingbf0ab102011-02-19 05:20:51 -0500153 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800154 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 04:51:16 -0500155 int show_rename_progress;
Johan Herland712d2c72011-04-29 11:36:20 +0200156 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700157 int setup;
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800158 int abbrev;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700159 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 10:11:28 -0700160/* white-space error highlighting */
Stefan Beller091f8e22017-06-29 17:06:53 -0700161#define WSEH_NEW (1<<12)
162#define WSEH_CONTEXT (1<<13)
163#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 10:11:28 -0700164 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800165 const char *prefix;
166 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200167 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 17:40:23 +0200168 long xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700169
Jonathan Tan2477ab22017-11-27 11:47:47 -0800170 /* see Documentation/diff-options.txt */
171 char **anchors;
172 size_t anchors_nr, anchors_alloc;
173
Junio C Hamanoa2540022006-09-26 18:53:02 -0700174 int stat_width;
175 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +0100176 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +0200177 int stat_count;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100178 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200179 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 16:27:21 -0700180 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700181
Stefan Beller15af58c2018-01-04 14:50:42 -0800182 struct oidset *objfind;
183
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100184 /* this is set by diffcore for DIFF_FORMAT_PATCH */
185 int found_changes;
186
Junio C Hamano44c48a92010-08-13 12:17:45 -0700187 /* to support internal diff recursion by --follow hack*/
188 int found_follow;
189
Junio C Hamano6c374002013-05-10 17:10:11 +0200190 void (*set_default)(struct diff_options *);
191
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400192 FILE *file;
193 int close_file;
194
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700195 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-07 01:46:26 +0400196 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700197 change_fn_t change;
198 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 11:27:45 -0400199 void *change_fn_data;
Jeff King04245582006-09-07 02:35:42 -0400200 diff_format_fn_t format_callback;
201 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800202 diff_prefix_fn_t output_prefix;
203 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +1100204
205 int diff_path_counter;
Stefan Bellere6e045f2017-06-29 17:07:06 -0700206
207 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700208 enum {
209 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 13:53:08 -0700210 COLOR_MOVED_PLAIN = 1,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700211 COLOR_MOVED_ZEBRA = 2,
Stefan Beller86b452e2017-06-30 13:53:09 -0700212 COLOR_MOVED_ZEBRA_DIM = 3,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700213 } color_moved;
214 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-15 18:27:39 -0700215 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700216};
217
Stefan Bellerf3597132017-06-29 17:07:00 -0700218void diff_emit_submodule_del(struct diff_options *o, const char *line);
219void diff_emit_submodule_add(struct diff_options *o, const char *line);
220void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
221void diff_emit_submodule_modified(struct diff_options *o, const char *path);
222void diff_emit_submodule_header(struct diff_options *o, const char *header);
223void diff_emit_submodule_error(struct diff_options *o, const char *err);
224void diff_emit_submodule_pipethrough(struct diff_options *o,
225 const char *line, int len);
226
Jeff Kingce436972006-07-23 05:24:18 -0400227enum color_diff {
228 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 16:48:46 -0400229 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 05:24:18 -0400230 DIFF_METAINFO = 2,
231 DIFF_FRAGINFO = 3,
232 DIFF_FILE_OLD = 4,
233 DIFF_FILE_NEW = 5,
234 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700235 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700236 DIFF_FUNCINFO = 8,
237 DIFF_FILE_OLD_MOVED = 9,
238 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 13:53:09 -0700239 DIFF_FILE_OLD_MOVED_DIM = 11,
240 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
241 DIFF_FILE_NEW_MOVED = 13,
242 DIFF_FILE_NEW_MOVED_ALT = 14,
243 DIFF_FILE_NEW_MOVED_DIM = 15,
244 DIFF_FILE_NEW_MOVED_ALT_DIM = 16
Jeff Kingce436972006-07-23 05:24:18 -0400245};
246const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100247#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -0700248 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100249
Jeff Kingce436972006-07-23 05:24:18 -0400250
John Keepingf1922232013-02-07 20:15:26 +0000251const char *diff_line_prefix(struct diff_options *);
252
253
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200254extern const char mime_boundary_leader[];
255
Kirill Smelkov72441af2014-04-07 01:46:26 +0400256extern struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 10:31:06 -0700257 struct combine_diff_path *p, const struct object_id *oid,
258 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-07 01:46:26 +0400259 struct strbuf *base, struct diff_options *opt);
Brandon Williams66f414f2017-05-30 10:31:03 -0700260extern int diff_tree_oid(const struct object_id *old_oid,
261 const struct object_id *new_oid,
262 const char *base, struct diff_options *opt);
Brandon Williams7b8dea02017-05-30 10:30:57 -0700263extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
264 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700265
Junio C Hamanoea726d02006-01-28 00:03:38 -0800266struct combine_diff_path {
267 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800268 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800269 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000270 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800271 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800272 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800273 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33 +0000274 struct object_id oid;
Junio C Hamano2454c962006-02-06 12:53:07 -0800275 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800276};
Junio C Hamano2454c962006-02-06 12:53:07 -0800277#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 06:21:30 -0500278 st_add4(sizeof(struct combine_diff_path), (l), 1, \
279 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 00:03:38 -0800280
Linus Torvalds91539832006-04-17 11:59:32 -0700281extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
282 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800283
Brandon Williamsb9acf542017-05-30 10:30:55 -0700284extern void 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 -0700285
René Scharfe82889292011-12-17 11:20:07 +0100286extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800287
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700288void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
289
Junio C Hamano28b92642011-05-31 09:14:17 -0700290extern int diff_can_quit_early(struct diff_options *);
291
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700292extern void diff_addremove(struct diff_options *,
293 int addremove,
Junio C Hamano77eb2722005-04-27 09:21:00 -0700294 unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -0700295 const struct object_id *oid,
296 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100297 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700298
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700299extern void diff_change(struct diff_options *,
300 unsigned mode1, unsigned mode2,
Brandon Williams94a00972017-05-30 10:30:49 -0700301 const struct object_id *old_oid,
302 const struct object_id *new_oid,
303 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100304 const char *fullpath,
305 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700306
Junio C Hamanofa7b2902011-04-22 16:05:58 -0700307extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700308
Junio C Hamano19feebc2005-05-27 15:54:37 -0700309#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700310#define DIFF_SETUP_USE_CACHE 2
311#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700312
Matthieu Moydea007f2010-08-05 10:22:52 +0200313/*
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +0100314 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 10:22:52 +0200315 * (--option=value) and separate form (--option value).
316 */
317extern int parse_long_opt(const char *opt, const char **argv,
318 const char **optarg);
319
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100320extern int git_diff_basic_config(const char *var, const char *value, void *cb);
Michael Haggerty5b162872016-09-05 11:44:53 +0200321extern int git_diff_heuristic_config(const char *var, const char *value, void *cb);
Matthieu Moy5404c112016-02-25 09:59:21 +0100322extern void init_diff_ui_defaults(void);
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100323extern int git_diff_ui_config(const char *var, const char *value, void *cb);
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700324extern void diff_setup(struct diff_options *);
Duy Nguyena97262c2016-01-21 18:48:44 +0700325extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
Thomas Rast28452652012-08-03 14:16:24 +0200326extern void diff_setup_done(struct diff_options *);
Ben Peart85b46032018-05-02 16:01:14 +0000327extern int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-25 18:22:47 -0700328
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700329#define DIFF_DETECT_RENAME 1
330#define DIFF_DETECT_COPY 2
331
Junio C Hamano367cec12005-05-27 15:55:28 -0700332#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200333#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700334
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700335#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
336#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 14:50:42 -0800337#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700338
Stefan Beller15af58c2018-01-04 14:50:42 -0800339#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
340 DIFF_PICKAXE_KIND_G | \
341 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 14:50:41 -0800342
Stefan Bellerc1ddc462018-01-04 14:50:40 -0800343#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700344
Junio C Hamanodda2d792005-07-13 12:52:35 -0700345extern void diffcore_std(struct diff_options *);
346extern void diffcore_fix_diff_index(struct diff_options *);
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700347
348#define COMMON_DIFF_OPTIONS_HELP \
349"\ncommon diff options:\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200350" -z output diff-raw with lines terminated with NUL.\n" \
351" -p output patch format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200352" -u synonym for -p.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700353" --patch-with-raw\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200354" output both a patch and the diff-raw format.\n" \
355" --stat show diffstat instead of patch.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700356" --numstat show numeric diffstat instead of patch.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700357" --patch-with-stat\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800358" output a patch and prepend its diffstat.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800359" --name-only show only names of changed files.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700360" --name-status show names and status of changed files.\n" \
361" --full-index show full object name on index lines.\n" \
362" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
363" -R swap input file pairs.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700364" -B detect complete rewrites.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700365" -M detect renames.\n" \
366" -C detect copies.\n" \
367" --find-copies-harder\n" \
368" try unchanged files as candidate for copy detection.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700369" -l<n> limit rename attempts up to <n> paths.\n" \
Stephan Federca499202006-07-07 15:57:08 +0200370" -O<file> reorder diffs according to the <file>.\n" \
371" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700372" --pickaxe-all\n" \
Junio C Hamano38c6f782005-05-21 19:40:36 -0700373" show all files diff when -S is used and hit is found.\n" \
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700374" -a --text treat all files as text.\n"
Junio C Hamano86436c22005-04-25 18:22:47 -0700375
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700376extern int diff_queue_is_empty(void);
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700377extern void diff_flush(struct diff_options*);
Junio C Hamanof31027c2011-01-06 13:50:06 -0800378extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-25 18:22:47 -0700379
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700380/* diff-raw status letters */
381#define DIFF_STATUS_ADDED 'A'
382#define DIFF_STATUS_COPIED 'C'
383#define DIFF_STATUS_DELETED 'D'
384#define DIFF_STATUS_MODIFIED 'M'
385#define DIFF_STATUS_RENAMED 'R'
386#define DIFF_STATUS_TYPE_CHANGED 'T'
387#define DIFF_STATUS_UNKNOWN 'X'
388#define DIFF_STATUS_UNMERGED 'U'
389
390/* these are not diff-raw status letters proper, but used by
391 * diffcore-filter insn to specify additional restrictions.
392 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700393#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700394#define DIFF_STATUS_FILTER_BROKEN 'B'
395
Jeff Kingd5e3b012016-10-20 02:19:43 -0400396/*
397 * This is different from find_unique_abbrev() in that
398 * it stuffs the result with dots for alignment.
399 */
Jeff Kingd6cece52016-10-20 02:20:07 -0400400extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800401
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800402/* do not report anything on removed paths */
403#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800404/* report racily-clean paths as modified */
405#define DIFF_RACY_IS_MODIFIED 02
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800406extern int run_diff_files(struct rev_info *revs, unsigned int option);
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700407extern int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700408
brian m. carlson944cffb2017-05-06 22:10:35 +0000409extern int do_diff_cache(const struct object_id *, struct diff_options *);
Brandon Williamsbd25f282017-05-30 10:30:54 -0700410extern int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200411
Junio C Hamanoda31b352007-12-13 23:40:27 -0800412extern int diff_result_code(struct diff_options *, int);
413
Nguyễn Thái Ngọc Duye5f7a5d2016-01-20 18:06:02 +0700414extern void diff_no_index(struct rev_info *, int, const char **);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700415
Brandon Williams02f2f562017-10-31 11:19:05 -0700416extern int index_differs_from(const char *def, const struct diff_flags *flags,
417 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100418
Jeff Kinga64e6a42016-02-22 13:28:54 -0500419/*
420 * Fill the contents of the filespec "df", respecting any textconv defined by
421 * its userdiff driver. The "driver" parameter must come from a
422 * previous call to get_textconv(), and therefore should either be NULL or have
423 * textconv enabled.
424 *
425 * Note that the memory ownership of the resulting buffer depends on whether
426 * the driver field is NULL. If it is, then the memory belongs to the filespec
427 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
428 * that should be freed by the caller.
429 */
Axel Bonneta788d7d2010-06-07 17:23:36 +0200430extern size_t fill_textconv(struct userdiff_driver *driver,
431 struct diff_filespec *df,
432 char **outbuf);
433
Jeff Kinga64e6a42016-02-22 13:28:54 -0500434/*
435 * Look up the userdiff driver for the given filespec, and return it if
436 * and only if it has textconv enabled (otherwise return NULL). The result
437 * can be passed to fill_textconv().
438 */
Axel Bonneta788d7d2010-06-07 17:23:36 +0200439extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
440
Jeff Smith3a35cb22017-05-24 00:15:10 -0500441/*
442 * Prepare diff_filespec and convert it using diff textconv API
443 * if the textconv driver exists.
444 * Return 1 if the conversion succeeds, 0 otherwise.
445 */
446extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);
447
Kevin Ballard10ae7522010-09-27 16:58:25 -0700448extern int parse_rename_score(const char **cp_p);
449
Michal Privoznik07924d42013-01-16 08:51:58 +0100450extern long parse_algorithm_value(const char *value);
451
Stefan Beller0911c472017-06-29 17:07:02 -0700452extern void print_stat_summary(FILE *fp, int files,
453 int insertions, int deletions);
Nguyễn Thái Ngọc Duy4914c962012-10-26 22:53:52 +0700454extern void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700455
Junio C Hamano86436c22005-04-25 18:22:47 -0700456#endif /* DIFF_H */