git status: Fix false positive "new commits" output for dirty 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,
e3d42c47
JL
17 const char *fullpath,
18 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
ac1b3d12
LT
19
20typedef void (*add_remove_fn_t)(struct diff_options *options,
21 int addremove, unsigned mode,
22 const unsigned char *sha1,
e3d42c47 23 const char *fullpath, unsigned dirty_submodule);
ac1b3d12 24
04245581
JK
25typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
26 struct diff_options *options, void *data);
27
c6744349
TH
28#define DIFF_FORMAT_RAW 0x0001
29#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5
JH
30#define DIFF_FORMAT_NUMSTAT 0x0004
31#define DIFF_FORMAT_SUMMARY 0x0008
32#define DIFF_FORMAT_PATCH 0x0010
ebd124c6 33#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019 34#define DIFF_FORMAT_DIRSTAT 0x0040
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)
90b19941 59#define DIFF_OPT_QUICK (1 << 11)
8f67f8ae
PH
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)
f88d225f 67#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
fd33777b 68#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
c7534ef4 69#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
f245194f 70#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
752c0c24 71#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
9297f77e 72#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
752c0c24 73
8f67f8ae
PH
74#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
75#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
76#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
628d5c2b
KC
77#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
78#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
79#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae 80
6b5ee137 81struct diff_options {
6b5ee137
JH
82 const char *filter;
83 const char *orderfile;
84 const char *pickaxe;
2f3f8b21 85 const char *single_follow;
eab9a40b 86 const char *a_prefix, *b_prefix;
8f67f8ae 87 unsigned flags;
ee1e5412 88 int context;
6d0e674a 89 int interhunkcontext;
6b5ee137
JH
90 int break_opt;
91 int detect_rename;
fb13227e 92 int skip_stat_unmatch;
6b5ee137
JH
93 int line_termination;
94 int output_format;
95 int pickaxe_opts;
96 int rename_score;
8082d8d3 97 int rename_limit;
b8960bbe 98 int warn_on_too_large_rename;
7df7c019 99 int dirstat_percent;
6b5ee137 100 int setup;
47dd0d59 101 int abbrev;
cd676a51
JH
102 const char *prefix;
103 int prefix_length;
698ce6f8 104 const char *stat_sep;
0d21efa5 105 long xdl_opts;
ac1b3d12 106
a2540023
JH
107 int stat_width;
108 int stat_name_width;
2b6a5417 109 const char *word_regex;
a2540023 110
34a5e1a2
JS
111 /* this is set by diffcore for DIFF_FORMAT_PATCH */
112 int found_changes;
113
c0c77734
DB
114 FILE *file;
115 int close_file;
116
a8baa7b9
JH
117 int nr_paths;
118 const char **paths;
119 int *pathlens;
ac1b3d12
LT
120 change_fn_t change;
121 add_remove_fn_t add_remove;
04245581
JK
122 diff_format_fn_t format_callback;
123 void *format_callback_data;
6b5ee137
JH
124};
125
ce436973
JK
126enum color_diff {
127 DIFF_RESET = 0,
128 DIFF_PLAIN = 1,
129 DIFF_METAINFO = 2,
130 DIFF_FRAGINFO = 3,
131 DIFF_FILE_OLD = 4,
132 DIFF_FILE_NEW = 5,
133 DIFF_COMMIT = 6,
448c3ef1 134 DIFF_WHITESPACE = 7,
89cb73a1 135 DIFF_FUNCINFO = 8,
ce436973
JK
136};
137const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae
PH
138#define diff_get_color_opt(o, ix) \
139 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
140
ce436973 141
698ce6f8
JS
142extern const char mime_boundary_leader[];
143
a8baa7b9
JH
144extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
145extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
146extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
147 const char *base, struct diff_options *opt);
148extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
149 const char *base, struct diff_options *opt);
2b60356d
RS
150extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
151 struct diff_options *opt);
ac1b3d12 152
ea726d02
JH
153struct combine_diff_path {
154 struct combine_diff_path *next;
155 int len;
156 char *path;
2454c962 157 unsigned int mode;
ea726d02 158 unsigned char sha1[20];
2454c962 159 struct combine_diff_parent {
d416df88 160 char status;
2454c962
JH
161 unsigned int mode;
162 unsigned char sha1[20];
163 } parent[FLEX_ARRAY];
ea726d02 164};
2454c962
JH
165#define combine_diff_path_size(n, l) \
166 (sizeof(struct combine_diff_path) + \
167 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 168
91539833
LT
169extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
170 int dense, struct rev_info *);
ea726d02 171
0fe7c1de
JH
172extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
173
91539833 174extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
af3feefa 175
a5a818ee
JH
176void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
177
6b5ee137
JH
178extern void diff_addremove(struct diff_options *,
179 int addremove,
77eb2720
JH
180 unsigned mode,
181 const unsigned char *sha1,
e3d42c47 182 const char *fullpath, unsigned dirty_submodule);
77eb2720 183
6b5ee137
JH
184extern void diff_change(struct diff_options *,
185 unsigned mode1, unsigned mode2,
186 const unsigned char *sha1,
187 const unsigned char *sha2,
e3d42c47
JL
188 const char *fullpath,
189 unsigned dirty_submodule1, unsigned dirty_submodule2);
77eb2720 190
6b5ee137 191extern void diff_unmerge(struct diff_options *,
e9c84099
JH
192 const char *path,
193 unsigned mode,
194 const unsigned char *sha1);
77eb2720 195
19feebc8 196#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
197#define DIFF_SETUP_USE_CACHE 2
198#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 199
ef90d6d4
JS
200extern int git_diff_basic_config(const char *var, const char *value, void *cb);
201extern int git_diff_ui_config(const char *var, const char *value, void *cb);
6b2f2d98 202extern int diff_use_color_default;
6b5ee137
JH
203extern void diff_setup(struct diff_options *);
204extern int diff_opt_parse(struct diff_options *, const char **, int);
205extern int diff_setup_done(struct diff_options *);
86436c28 206
6b14d7fa
JH
207#define DIFF_DETECT_RENAME 1
208#define DIFF_DETECT_COPY 2
209
367cec1c 210#define DIFF_PICKAXE_ALL 1
d01d8c67 211#define DIFF_PICKAXE_REGEX 2
f345b0a0 212
6b5ee137 213extern void diffcore_std(struct diff_options *);
730f7284 214extern void diffcore_fix_diff_index(struct diff_options *);
f2ce9fde 215
dda2d79a
JH
216#define COMMON_DIFF_OPTIONS_HELP \
217"\ncommon diff options:\n" \
8082d8d3
JH
218" -z output diff-raw with lines terminated with NUL.\n" \
219" -p output patch format.\n" \
220" -u synonym for -p.\n" \
5c91da25
PB
221" --patch-with-raw\n" \
222" output both a patch and the diff-raw format.\n" \
d75f7952 223" --stat show diffstat instead of patch.\n" \
74e2abe5 224" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
225" --patch-with-stat\n" \
226" output a patch and prepend its diffstat.\n" \
8082d8d3 227" --name-only show only names of changed files.\n" \
946f5f7c 228" --name-status show names and status of changed files.\n" \
47dd0d59 229" --full-index show full object name on index lines.\n" \
913419fc 230" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
231" -R swap input file pairs.\n" \
232" -B detect complete rewrites.\n" \
233" -M detect renames.\n" \
234" -C detect copies.\n" \
dda2d79a 235" --find-copies-harder\n" \
8082d8d3
JH
236" try unchanged files as candidate for copy detection.\n" \
237" -l<n> limit rename attempts up to <n> paths.\n" \
238" -O<file> reorder diffs according to the <file>.\n" \
239" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 240" --pickaxe-all\n" \
ca49920f
SF
241" show all files diff when -S is used and hit is found.\n" \
242" -a --text treat all files as text.\n"
dda2d79a 243
38c6f780 244extern int diff_queue_is_empty(void);
6b5ee137 245extern void diff_flush(struct diff_options*);
86436c28 246
e7baa4f4 247/* diff-raw status letters */
ca8c9156 248#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
249#define DIFF_STATUS_COPIED 'C'
250#define DIFF_STATUS_DELETED 'D'
251#define DIFF_STATUS_MODIFIED 'M'
252#define DIFF_STATUS_RENAMED 'R'
253#define DIFF_STATUS_TYPE_CHANGED 'T'
254#define DIFF_STATUS_UNKNOWN 'X'
255#define DIFF_STATUS_UNMERGED 'U'
256
257/* these are not diff-raw status letters proper, but used by
258 * diffcore-filter insn to specify additional restrictions.
259 */
0b34379a 260#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
261#define DIFF_STATUS_FILTER_BROKEN 'B'
262
47dd0d59
JH
263extern const char *diff_unique_abbrev(const unsigned char *, int);
264
4bd5b7da
JH
265/* do not report anything on removed paths */
266#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
267/* report racily-clean paths as modified */
268#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 269extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e 270extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 271
1cfe7733 272extern int do_diff_cache(const unsigned char *, struct diff_options *);
fcb3d0ad
JS
273extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
274
da31b358
JH
275extern int diff_result_code(struct diff_options *, int);
276
0569e9b8
JH
277extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
278
75f3ff2e
SB
279extern int index_differs_from(const char *def, int diff_flags);
280
86436c28 281#endif /* DIFF_H */