diff: allow lowercase letter to specify what change class to exclude
[git/git.git] / diff.h
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c28
JH
4#ifndef DIFF_H
5#define DIFF_H
6
1b0c7174 7#include "tree-walk.h"
50f9a858 8
91539833 9struct rev_info;
ac1b3d12 10struct diff_options;
04245581 11struct diff_queue_struct;
a3c158d4 12struct strbuf;
a788d7d5
AB
13struct diff_filespec;
14struct userdiff_driver;
0041f09d 15struct sha1_array;
82889295 16struct commit;
ac1b3d12
LT
17
18typedef void (*change_fn_t)(struct diff_options *options,
19 unsigned old_mode, unsigned new_mode,
20 const unsigned char *old_sha1,
21 const unsigned char *new_sha1,
e5450100 22 int old_sha1_valid, int new_sha1_valid,
e3d42c47
JL
23 const char *fullpath,
24 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
ac1b3d12
LT
25
26typedef void (*add_remove_fn_t)(struct diff_options *options,
27 int addremove, unsigned mode,
28 const unsigned char *sha1,
e5450100 29 int sha1_valid,
e3d42c47 30 const char *fullpath, unsigned dirty_submodule);
ac1b3d12 31
04245581
JK
32typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
33 struct diff_options *options, void *data);
34
a3c158d4
BY
35typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
36
c6744349
TH
37#define DIFF_FORMAT_RAW 0x0001
38#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
39#define DIFF_FORMAT_NUMSTAT 0x0004
40#define DIFF_FORMAT_SUMMARY 0x0008
41#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 42#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019 43#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349
TH
44
45/* These override all above */
74e2abe5
JH
46#define DIFF_FORMAT_NAME 0x0100
47#define DIFF_FORMAT_NAME_STATUS 0x0200
48#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
49
50/* Same as output_format = 0 but we know that -s flag was given
51 * and we should not give default value to output_format.
52 */
74e2abe5 53#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 54
74e2abe5 55#define DIFF_FORMAT_CALLBACK 0x1000
04245581 56
8f67f8ae
PH
57#define DIFF_OPT_RECURSIVE (1 << 0)
58#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
59#define DIFF_OPT_BINARY (1 << 2)
60#define DIFF_OPT_TEXT (1 << 3)
61#define DIFF_OPT_FULL_INDEX (1 << 4)
62#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
63#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
64#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
90d43b07 65#define DIFF_OPT_RENAME_EMPTY (1 << 8)
882749a0 66/* (1 << 9) unused */
8f67f8ae 67#define DIFF_OPT_HAS_CHANGES (1 << 10)
90b19941 68#define DIFF_OPT_QUICK (1 << 11)
8f67f8ae
PH
69#define DIFF_OPT_NO_INDEX (1 << 12)
70#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
71#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
72#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895 73#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51 74#define DIFF_OPT_RELATIVE_NAME (1 << 17)
50fd9bd8 75#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
f88d225f 76#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
fd33777b 77#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
c7534ef4 78#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
f245194f 79#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
752c0c24 80#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
9297f77e 81#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
3bfc4504 82#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
4af574db 83#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
aee9c7d6 84#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
1c57a627 85#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
14937c2c 86#define DIFF_OPT_FUNCCONTEXT (1 << 29)
accccde4 87#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
752c0c24 88
8f67f8ae
PH
89#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
90#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
91#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
628d5c2b
KC
92#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
93#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
94#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae 95
307ab20b
JH
96#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
97
882749a0
TR
98enum diff_words_type {
99 DIFF_WORDS_NONE = 0,
100 DIFF_WORDS_PORCELAIN,
101 DIFF_WORDS_PLAIN,
102 DIFF_WORDS_COLOR
103};
104
6b5ee137 105struct diff_options {
6b5ee137
JH
106 const char *orderfile;
107 const char *pickaxe;
2f3f8b21 108 const char *single_follow;
eab9a40b 109 const char *a_prefix, *b_prefix;
8f67f8ae 110 unsigned flags;
1ecc1cbd
JH
111
112 /* diff-filter bits */
113 unsigned int filter;
114
f1c96261 115 int use_color;
ee1e5412 116 int context;
6d0e674a 117 int interhunkcontext;
6b5ee137
JH
118 int break_opt;
119 int detect_rename;
467ddc14 120 int irreversible_delete;
fb13227e 121 int skip_stat_unmatch;
6b5ee137
JH
122 int line_termination;
123 int output_format;
124 int pickaxe_opts;
125 int rename_score;
8082d8d3 126 int rename_limit;
bf0ab10f 127 int needed_rename_limit;
f31027c9 128 int degraded_cc_to_c;
3ac942d4 129 int show_rename_progress;
712d2c7d 130 int dirstat_permille;
6b5ee137 131 int setup;
47dd0d59 132 int abbrev;
cd676a51
JH
133 const char *prefix;
134 int prefix_length;
698ce6f8 135 const char *stat_sep;
0d21efa5 136 long xdl_opts;
ac1b3d12 137
a2540023
JH
138 int stat_width;
139 int stat_name_width;
969fe57b 140 int stat_graph_width;
808e1db2 141 int stat_count;
2b6a5417 142 const char *word_regex;
882749a0 143 enum diff_words_type word_diff;
a2540023 144
34a5e1a2
JS
145 /* this is set by diffcore for DIFF_FORMAT_PATCH */
146 int found_changes;
147
44c48a90
JH
148 /* to support internal diff recursion by --follow hack*/
149 int found_follow;
150
c0c77734
DB
151 FILE *file;
152 int close_file;
153
66f13625 154 struct pathspec pathspec;
ac1b3d12
LT
155 change_fn_t change;
156 add_remove_fn_t add_remove;
04245581
JK
157 diff_format_fn_t format_callback;
158 void *format_callback_data;
a3c158d4 159 diff_prefix_fn_t output_prefix;
5e71a84a 160 int output_prefix_length;
a3c158d4 161 void *output_prefix_data;
6b5ee137
JH
162};
163
ce436973
JK
164enum color_diff {
165 DIFF_RESET = 0,
166 DIFF_PLAIN = 1,
167 DIFF_METAINFO = 2,
168 DIFF_FRAGINFO = 3,
169 DIFF_FILE_OLD = 4,
170 DIFF_FILE_NEW = 5,
171 DIFF_COMMIT = 6,
448c3ef1 172 DIFF_WHITESPACE = 7,
4b05548f 173 DIFF_FUNCINFO = 8
ce436973
JK
174};
175const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae 176#define diff_get_color_opt(o, ix) \
f1c96261 177 diff_get_color((o)->use_color, ix)
8f67f8ae 178
ce436973 179
f1922234
JK
180const char *diff_line_prefix(struct diff_options *);
181
182
698ce6f8
JS
183extern const char mime_boundary_leader[];
184
a8baa7b9
JH
185extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
186extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
187extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
188 const char *base, struct diff_options *opt);
189extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
190 const char *base, struct diff_options *opt);
2b60356d
RS
191extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
192 struct diff_options *opt);
ac1b3d12 193
ea726d02
JH
194struct combine_diff_path {
195 struct combine_diff_path *next;
196 int len;
197 char *path;
2454c962 198 unsigned int mode;
ea726d02 199 unsigned char sha1[20];
2454c962 200 struct combine_diff_parent {
d416df88 201 char status;
2454c962
JH
202 unsigned int mode;
203 unsigned char sha1[20];
204 } parent[FLEX_ARRAY];
ea726d02 205};
2454c962
JH
206#define combine_diff_path_size(n, l) \
207 (sizeof(struct combine_diff_path) + \
208 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 209
91539833
LT
210extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
211 int dense, struct rev_info *);
ea726d02 212
0041f09d 213extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
0fe7c1de 214
82889295 215extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
af3feefa 216
a5a818ee
JH
217void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
218
28b9264d
JH
219extern int diff_can_quit_early(struct diff_options *);
220
6b5ee137
JH
221extern void diff_addremove(struct diff_options *,
222 int addremove,
77eb2720
JH
223 unsigned mode,
224 const unsigned char *sha1,
e5450100 225 int sha1_valid,
e3d42c47 226 const char *fullpath, unsigned dirty_submodule);
77eb2720 227
6b5ee137
JH
228extern void diff_change(struct diff_options *,
229 unsigned mode1, unsigned mode2,
230 const unsigned char *sha1,
231 const unsigned char *sha2,
e5450100
JK
232 int sha1_valid,
233 int sha2_valid,
e3d42c47
JL
234 const char *fullpath,
235 unsigned dirty_submodule1, unsigned dirty_submodule2);
77eb2720 236
fa7b2908 237extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
77eb2720 238
19feebc8 239#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
240#define DIFF_SETUP_USE_CACHE 2
241#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 242
dea007fb
MM
243/*
244 * Poor man's alternative to parse-option, to allow both sticked form
245 * (--option=value) and separate form (--option value).
246 */
247extern int parse_long_opt(const char *opt, const char **argv,
248 const char **optarg);
249
ef90d6d4
JS
250extern int git_diff_basic_config(const char *var, const char *value, void *cb);
251extern int git_diff_ui_config(const char *var, const char *value, void *cb);
6b5ee137
JH
252extern void diff_setup(struct diff_options *);
253extern int diff_opt_parse(struct diff_options *, const char **, int);
28452655 254extern void diff_setup_done(struct diff_options *);
86436c28 255
6b14d7fa
JH
256#define DIFF_DETECT_RENAME 1
257#define DIFF_DETECT_COPY 2
258
367cec1c 259#define DIFF_PICKAXE_ALL 1
d01d8c67 260#define DIFF_PICKAXE_REGEX 2
f345b0a0 261
f506b8e8
JH
262#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
263#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
264
6b5ee137 265extern void diffcore_std(struct diff_options *);
730f7284 266extern void diffcore_fix_diff_index(struct diff_options *);
f2ce9fde 267
dda2d79a
JH
268#define COMMON_DIFF_OPTIONS_HELP \
269"\ncommon diff options:\n" \
8082d8d3
JH
270" -z output diff-raw with lines terminated with NUL.\n" \
271" -p output patch format.\n" \
272" -u synonym for -p.\n" \
5c91da25
PB
273" --patch-with-raw\n" \
274" output both a patch and the diff-raw format.\n" \
d75f7952 275" --stat show diffstat instead of patch.\n" \
74e2abe5 276" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
277" --patch-with-stat\n" \
278" output a patch and prepend its diffstat.\n" \
8082d8d3 279" --name-only show only names of changed files.\n" \
946f5f7c 280" --name-status show names and status of changed files.\n" \
47dd0d59 281" --full-index show full object name on index lines.\n" \
913419fc 282" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
283" -R swap input file pairs.\n" \
284" -B detect complete rewrites.\n" \
285" -M detect renames.\n" \
286" -C detect copies.\n" \
dda2d79a 287" --find-copies-harder\n" \
8082d8d3
JH
288" try unchanged files as candidate for copy detection.\n" \
289" -l<n> limit rename attempts up to <n> paths.\n" \
290" -O<file> reorder diffs according to the <file>.\n" \
291" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 292" --pickaxe-all\n" \
ca49920f
SF
293" show all files diff when -S is used and hit is found.\n" \
294" -a --text treat all files as text.\n"
dda2d79a 295
38c6f780 296extern int diff_queue_is_empty(void);
6b5ee137 297extern void diff_flush(struct diff_options*);
f31027c9 298extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
86436c28 299
e7baa4f4 300/* diff-raw status letters */
ca8c9156 301#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
302#define DIFF_STATUS_COPIED 'C'
303#define DIFF_STATUS_DELETED 'D'
304#define DIFF_STATUS_MODIFIED 'M'
305#define DIFF_STATUS_RENAMED 'R'
306#define DIFF_STATUS_TYPE_CHANGED 'T'
307#define DIFF_STATUS_UNKNOWN 'X'
308#define DIFF_STATUS_UNMERGED 'U'
309
310/* these are not diff-raw status letters proper, but used by
311 * diffcore-filter insn to specify additional restrictions.
312 */
0b34379a 313#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
314#define DIFF_STATUS_FILTER_BROKEN 'B'
315
47dd0d59
JH
316extern const char *diff_unique_abbrev(const unsigned char *, int);
317
4bd5b7da
JH
318/* do not report anything on removed paths */
319#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
320/* report racily-clean paths as modified */
321#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 322extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e 323extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 324
1cfe7733 325extern int do_diff_cache(const unsigned char *, struct diff_options *);
fcb3d0ad
JS
326extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
327
da31b358
JH
328extern int diff_result_code(struct diff_options *, int);
329
0569e9b8
JH
330extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
331
75f3ff2e
SB
332extern int index_differs_from(const char *def, int diff_flags);
333
a788d7d5
AB
334extern size_t fill_textconv(struct userdiff_driver *driver,
335 struct diff_filespec *df,
336 char **outbuf);
337
338extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
339
10ae7526
KB
340extern int parse_rename_score(const char **cp_p);
341
07924d4d
MP
342extern long parse_algorithm_value(const char *value);
343
7f814632
NTND
344extern int print_stat_summary(FILE *fp, int files,
345 int insertions, int deletions);
4914c962 346extern void setup_diff_pager(struct diff_options *);
7f814632 347
86436c28 348#endif /* DIFF_H */