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