diff options: Introduce --ignore-submodules
[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;
ac1b3d12
LT
12
13typedef void (*change_fn_t)(struct diff_options *options,
14 unsigned old_mode, unsigned new_mode,
15 const unsigned char *old_sha1,
16 const unsigned char *new_sha1,
17 const char *base, const char *path);
18
19typedef void (*add_remove_fn_t)(struct diff_options *options,
20 int addremove, unsigned mode,
21 const unsigned char *sha1,
22 const char *base, const char *path);
23
04245581
JK
24typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
c6744349
TH
27#define DIFF_FORMAT_RAW 0x0001
28#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
29#define DIFF_FORMAT_NUMSTAT 0x0004
30#define DIFF_FORMAT_SUMMARY 0x0008
31#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 32#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019
LT
33#define DIFF_FORMAT_DIRSTAT 0x0040
34#define DIFF_FORMAT_CUMULATIVE 0x0080
c6744349
TH
35
36/* These override all above */
74e2abe5
JH
37#define DIFF_FORMAT_NAME 0x0100
38#define DIFF_FORMAT_NAME_STATUS 0x0200
39#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
40
41/* Same as output_format = 0 but we know that -s flag was given
42 * and we should not give default value to output_format.
43 */
74e2abe5 44#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 45
74e2abe5 46#define DIFF_FORMAT_CALLBACK 0x1000
04245581 47
8f67f8ae
PH
48#define DIFF_OPT_RECURSIVE (1 << 0)
49#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
50#define DIFF_OPT_BINARY (1 << 2)
51#define DIFF_OPT_TEXT (1 << 3)
52#define DIFF_OPT_FULL_INDEX (1 << 4)
53#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
54#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
55#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
56#define DIFF_OPT_COLOR_DIFF (1 << 8)
57#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
58#define DIFF_OPT_HAS_CHANGES (1 << 10)
59#define DIFF_OPT_QUIET (1 << 11)
60#define DIFF_OPT_NO_INDEX (1 << 12)
61#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
62#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
63#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895 64#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51 65#define DIFF_OPT_RELATIVE_NAME (1 << 17)
50fd9bd8 66#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
8f67f8ae
PH
67#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
68#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
69#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
70
6b5ee137 71struct diff_options {
6b5ee137
JH
72 const char *filter;
73 const char *orderfile;
74 const char *pickaxe;
2f3f8b21 75 const char *single_follow;
eab9a40b 76 const char *a_prefix, *b_prefix;
8f67f8ae 77 unsigned flags;
ee1e5412 78 int context;
6b5ee137
JH
79 int break_opt;
80 int detect_rename;
fb13227e 81 int skip_stat_unmatch;
6b5ee137
JH
82 int line_termination;
83 int output_format;
84 int pickaxe_opts;
85 int rename_score;
8082d8d3 86 int rename_limit;
b8960bbe 87 int warn_on_too_large_rename;
7df7c019 88 int dirstat_percent;
6b5ee137 89 int setup;
47dd0d59 90 int abbrev;
cd676a51
JH
91 const char *prefix;
92 int prefix_length;
698ce6f8 93 const char *stat_sep;
0d21efa5 94 long xdl_opts;
ac1b3d12 95
a2540023
JH
96 int stat_width;
97 int stat_name_width;
98
34a5e1a2
JS
99 /* this is set by diffcore for DIFF_FORMAT_PATCH */
100 int found_changes;
101
c0c77734
DB
102 FILE *file;
103 int close_file;
104
a8baa7b9
JH
105 int nr_paths;
106 const char **paths;
107 int *pathlens;
ac1b3d12
LT
108 change_fn_t change;
109 add_remove_fn_t add_remove;
04245581
JK
110 diff_format_fn_t format_callback;
111 void *format_callback_data;
6b5ee137
JH
112};
113
ce436973
JK
114enum color_diff {
115 DIFF_RESET = 0,
116 DIFF_PLAIN = 1,
117 DIFF_METAINFO = 2,
118 DIFF_FRAGINFO = 3,
119 DIFF_FILE_OLD = 4,
120 DIFF_FILE_NEW = 5,
121 DIFF_COMMIT = 6,
448c3ef1 122 DIFF_WHITESPACE = 7,
ce436973
JK
123};
124const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae
PH
125#define diff_get_color_opt(o, ix) \
126 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
127
ce436973 128
698ce6f8
JS
129extern const char mime_boundary_leader[];
130
a8baa7b9
JH
131extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
132extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
133extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
134 const char *base, struct diff_options *opt);
135extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
136 const char *base, struct diff_options *opt);
2b60356d
RS
137extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
138 struct diff_options *opt);
ac1b3d12 139
ea726d02
JH
140struct combine_diff_path {
141 struct combine_diff_path *next;
142 int len;
143 char *path;
2454c962 144 unsigned int mode;
ea726d02 145 unsigned char sha1[20];
2454c962 146 struct combine_diff_parent {
d416df88 147 char status;
2454c962
JH
148 unsigned int mode;
149 unsigned char sha1[20];
150 } parent[FLEX_ARRAY];
ea726d02 151};
2454c962
JH
152#define combine_diff_path_size(n, l) \
153 (sizeof(struct combine_diff_path) + \
154 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 155
91539833
LT
156extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
157 int dense, struct rev_info *);
ea726d02 158
0fe7c1de
JH
159extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
160
91539833 161extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
af3feefa 162
6b5ee137
JH
163extern void diff_addremove(struct diff_options *,
164 int addremove,
77eb2720
JH
165 unsigned mode,
166 const unsigned char *sha1,
167 const char *base,
168 const char *path);
169
6b5ee137
JH
170extern void diff_change(struct diff_options *,
171 unsigned mode1, unsigned mode2,
172 const unsigned char *sha1,
173 const unsigned char *sha2,
174 const char *base, const char *path);
77eb2720 175
6b5ee137 176extern void diff_unmerge(struct diff_options *,
e9c84099
JH
177 const char *path,
178 unsigned mode,
179 const unsigned char *sha1);
77eb2720 180
19feebc8 181#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
182#define DIFF_SETUP_USE_CACHE 2
183#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 184
9a1805a8 185extern int git_diff_basic_config(const char *var, const char *value);
83ad63cf 186extern int git_diff_ui_config(const char *var, const char *value);
6b2f2d98 187extern int diff_use_color_default;
6b5ee137
JH
188extern void diff_setup(struct diff_options *);
189extern int diff_opt_parse(struct diff_options *, const char **, int);
190extern int diff_setup_done(struct diff_options *);
86436c28 191
6b14d7fa
JH
192#define DIFF_DETECT_RENAME 1
193#define DIFF_DETECT_COPY 2
194
367cec1c 195#define DIFF_PICKAXE_ALL 1
d01d8c67 196#define DIFF_PICKAXE_REGEX 2
f345b0a0 197
6b5ee137 198extern void diffcore_std(struct diff_options *);
f2ce9fde 199
dda2d79a
JH
200#define COMMON_DIFF_OPTIONS_HELP \
201"\ncommon diff options:\n" \
8082d8d3
JH
202" -z output diff-raw with lines terminated with NUL.\n" \
203" -p output patch format.\n" \
204" -u synonym for -p.\n" \
5c91da25
PB
205" --patch-with-raw\n" \
206" output both a patch and the diff-raw format.\n" \
d75f7952 207" --stat show diffstat instead of patch.\n" \
74e2abe5 208" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
209" --patch-with-stat\n" \
210" output a patch and prepend its diffstat.\n" \
8082d8d3 211" --name-only show only names of changed files.\n" \
946f5f7c 212" --name-status show names and status of changed files.\n" \
47dd0d59 213" --full-index show full object name on index lines.\n" \
913419fc 214" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
215" -R swap input file pairs.\n" \
216" -B detect complete rewrites.\n" \
217" -M detect renames.\n" \
218" -C detect copies.\n" \
dda2d79a 219" --find-copies-harder\n" \
8082d8d3
JH
220" try unchanged files as candidate for copy detection.\n" \
221" -l<n> limit rename attempts up to <n> paths.\n" \
222" -O<file> reorder diffs according to the <file>.\n" \
223" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 224" --pickaxe-all\n" \
ca49920f
SF
225" show all files diff when -S is used and hit is found.\n" \
226" -a --text treat all files as text.\n"
dda2d79a 227
38c6f780 228extern int diff_queue_is_empty(void);
6b5ee137 229extern void diff_flush(struct diff_options*);
86436c28 230
e7baa4f4 231/* diff-raw status letters */
ca8c9156 232#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
233#define DIFF_STATUS_COPIED 'C'
234#define DIFF_STATUS_DELETED 'D'
235#define DIFF_STATUS_MODIFIED 'M'
236#define DIFF_STATUS_RENAMED 'R'
237#define DIFF_STATUS_TYPE_CHANGED 'T'
238#define DIFF_STATUS_UNKNOWN 'X'
239#define DIFF_STATUS_UNMERGED 'U'
240
241/* these are not diff-raw status letters proper, but used by
242 * diffcore-filter insn to specify additional restrictions.
243 */
0b34379a 244#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
245#define DIFF_STATUS_FILTER_BROKEN 'B'
246
47dd0d59
JH
247extern const char *diff_unique_abbrev(const unsigned char *, int);
248
4bd5b7da
JH
249/* do not report anything on removed paths */
250#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
251/* report racily-clean paths as modified */
252#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 253extern int run_diff_files(struct rev_info *revs, unsigned int option);
fcfa33ec
JS
254extern int setup_diff_no_index(struct rev_info *revs,
255 int argc, const char ** argv, int nongit, const char *prefix);
d516c2d1 256extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
6973dcae 257
5c21ac0e 258extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 259
1cfe7733 260extern int do_diff_cache(const unsigned char *, struct diff_options *);
fcb3d0ad
JS
261extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
262
da31b358
JH
263extern int diff_result_code(struct diff_options *, int);
264
86436c28 265#endif /* DIFF_H */