git status: Show detailed dirty status of submodules in long format
[git/git.git] / diff.h
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
6
7 #include "tree-walk.h"
8
9 struct rev_info;
10 struct diff_options;
11 struct diff_queue_struct;
12
13 typedef 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 *fullpath,
18 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
19
20 typedef void (*add_remove_fn_t)(struct diff_options *options,
21 int addremove, unsigned mode,
22 const unsigned char *sha1,
23 const char *fullpath, unsigned dirty_submodule);
24
25 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
26 struct diff_options *options, void *data);
27
28 #define DIFF_FORMAT_RAW 0x0001
29 #define DIFF_FORMAT_DIFFSTAT 0x0002
30 #define DIFF_FORMAT_NUMSTAT 0x0004
31 #define DIFF_FORMAT_SUMMARY 0x0008
32 #define DIFF_FORMAT_PATCH 0x0010
33 #define DIFF_FORMAT_SHORTSTAT 0x0020
34 #define DIFF_FORMAT_DIRSTAT 0x0040
35
36 /* These override all above */
37 #define DIFF_FORMAT_NAME 0x0100
38 #define DIFF_FORMAT_NAME_STATUS 0x0200
39 #define DIFF_FORMAT_CHECKDIFF 0x0400
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 */
44 #define DIFF_FORMAT_NO_OUTPUT 0x0800
45
46 #define DIFF_FORMAT_CALLBACK 0x1000
47
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_QUICK (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)
64 #define DIFF_OPT_CHECK_FAILED (1 << 16)
65 #define DIFF_OPT_RELATIVE_NAME (1 << 17)
66 #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
67 #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
68 #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
69 #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
70 #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
71 #define DIFF_OPT_SUBMODULE_LOG (1 << 23)
72 #define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
73
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)
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)
80
81 struct diff_options {
82 const char *filter;
83 const char *orderfile;
84 const char *pickaxe;
85 const char *single_follow;
86 const char *a_prefix, *b_prefix;
87 unsigned flags;
88 int context;
89 int interhunkcontext;
90 int break_opt;
91 int detect_rename;
92 int skip_stat_unmatch;
93 int line_termination;
94 int output_format;
95 int pickaxe_opts;
96 int rename_score;
97 int rename_limit;
98 int warn_on_too_large_rename;
99 int dirstat_percent;
100 int setup;
101 int abbrev;
102 const char *prefix;
103 int prefix_length;
104 const char *stat_sep;
105 long xdl_opts;
106
107 int stat_width;
108 int stat_name_width;
109 const char *word_regex;
110
111 /* this is set by diffcore for DIFF_FORMAT_PATCH */
112 int found_changes;
113
114 FILE *file;
115 int close_file;
116
117 int nr_paths;
118 const char **paths;
119 int *pathlens;
120 change_fn_t change;
121 add_remove_fn_t add_remove;
122 diff_format_fn_t format_callback;
123 void *format_callback_data;
124 };
125
126 enum 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,
134 DIFF_WHITESPACE = 7,
135 DIFF_FUNCINFO = 8,
136 };
137 const char *diff_get_color(int diff_use_color, enum color_diff ix);
138 #define diff_get_color_opt(o, ix) \
139 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
140
141
142 extern const char mime_boundary_leader[];
143
144 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
145 extern void diff_tree_release_paths(struct diff_options *);
146 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
147 const char *base, struct diff_options *opt);
148 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
149 const char *base, struct diff_options *opt);
150 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
151 struct diff_options *opt);
152
153 struct combine_diff_path {
154 struct combine_diff_path *next;
155 int len;
156 char *path;
157 unsigned int mode;
158 unsigned char sha1[20];
159 struct combine_diff_parent {
160 char status;
161 unsigned int mode;
162 unsigned char sha1[20];
163 } parent[FLEX_ARRAY];
164 };
165 #define combine_diff_path_size(n, l) \
166 (sizeof(struct combine_diff_path) + \
167 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
168
169 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
170 int dense, struct rev_info *);
171
172 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
173
174 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
175
176 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
177
178 extern void diff_addremove(struct diff_options *,
179 int addremove,
180 unsigned mode,
181 const unsigned char *sha1,
182 const char *fullpath, unsigned dirty_submodule);
183
184 extern void diff_change(struct diff_options *,
185 unsigned mode1, unsigned mode2,
186 const unsigned char *sha1,
187 const unsigned char *sha2,
188 const char *fullpath,
189 unsigned dirty_submodule1, unsigned dirty_submodule2);
190
191 extern void diff_unmerge(struct diff_options *,
192 const char *path,
193 unsigned mode,
194 const unsigned char *sha1);
195
196 #define DIFF_SETUP_REVERSE 1
197 #define DIFF_SETUP_USE_CACHE 2
198 #define DIFF_SETUP_USE_SIZE_CACHE 4
199
200 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
201 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
202 extern int diff_use_color_default;
203 extern void diff_setup(struct diff_options *);
204 extern int diff_opt_parse(struct diff_options *, const char **, int);
205 extern int diff_setup_done(struct diff_options *);
206
207 #define DIFF_DETECT_RENAME 1
208 #define DIFF_DETECT_COPY 2
209
210 #define DIFF_PICKAXE_ALL 1
211 #define DIFF_PICKAXE_REGEX 2
212
213 extern void diffcore_std(struct diff_options *);
214 extern void diffcore_fix_diff_index(struct diff_options *);
215
216 #define COMMON_DIFF_OPTIONS_HELP \
217 "\ncommon diff options:\n" \
218 " -z output diff-raw with lines terminated with NUL.\n" \
219 " -p output patch format.\n" \
220 " -u synonym for -p.\n" \
221 " --patch-with-raw\n" \
222 " output both a patch and the diff-raw format.\n" \
223 " --stat show diffstat instead of patch.\n" \
224 " --numstat show numeric diffstat instead of patch.\n" \
225 " --patch-with-stat\n" \
226 " output a patch and prepend its diffstat.\n" \
227 " --name-only show only names of changed files.\n" \
228 " --name-status show names and status of changed files.\n" \
229 " --full-index show full object name on index lines.\n" \
230 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
231 " -R swap input file pairs.\n" \
232 " -B detect complete rewrites.\n" \
233 " -M detect renames.\n" \
234 " -C detect copies.\n" \
235 " --find-copies-harder\n" \
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" \
240 " --pickaxe-all\n" \
241 " show all files diff when -S is used and hit is found.\n" \
242 " -a --text treat all files as text.\n"
243
244 extern int diff_queue_is_empty(void);
245 extern void diff_flush(struct diff_options*);
246
247 /* diff-raw status letters */
248 #define DIFF_STATUS_ADDED 'A'
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 */
260 #define DIFF_STATUS_FILTER_AON '*'
261 #define DIFF_STATUS_FILTER_BROKEN 'B'
262
263 extern const char *diff_unique_abbrev(const unsigned char *, int);
264
265 /* do not report anything on removed paths */
266 #define DIFF_SILENT_ON_REMOVED 01
267 /* report racily-clean paths as modified */
268 #define DIFF_RACY_IS_MODIFIED 02
269 extern int run_diff_files(struct rev_info *revs, unsigned int option);
270 extern int run_diff_index(struct rev_info *revs, int cached);
271
272 extern int do_diff_cache(const unsigned char *, struct diff_options *);
273 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
274
275 extern int diff_result_code(struct diff_options *, int);
276
277 extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
278
279 extern int index_differs_from(const char *def, int diff_flags);
280
281 #endif /* DIFF_H */