]>
Commit | Line | Data |
---|---|---|
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" |
64acde94 | 8 | #include "pathspec.h" |
1ff57c13 | 9 | #include "object.h" |
15af58c1 | 10 | #include "oidset.h" |
50f9a858 | 11 | |
13c4d7eb HW |
12 | /** |
13 | * The diff API is for programs that compare two sets of files (e.g. two trees, | |
14 | * one tree and the index) and present the found difference in various ways. | |
15 | * The calling program is responsible for feeding the API pairs of files, one | |
16 | * from the "old" set and the corresponding one from "new" set, that are | |
17 | * different. | |
18 | * The library called through this API is called diffcore, and is responsible | |
19 | * for two things. | |
20 | * | |
21 | * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and | |
22 | * changes that touch a string (`-S`), as specified by the caller. | |
23 | * | |
24 | * - outputting the differences in various formats, as specified by the caller. | |
25 | * | |
26 | * Calling sequence | |
27 | * ---------------- | |
28 | * | |
29 | * - Prepare `struct diff_options` to record the set of diff options, and then | |
30 | * call `repo_diff_setup()` to initialize this structure. This sets up the | |
31 | * vanilla default. | |
32 | * | |
33 | * - Fill in the options structure to specify desired output format, rename | |
34 | * detection, etc. `diff_opt_parse()` can be used to parse options given | |
35 | * from the command line in a way consistent with existing git-diff family | |
36 | * of programs. | |
37 | * | |
38 | * - Call `diff_setup_done()`; this inspects the options set up so far for | |
39 | * internal consistency and make necessary tweaking to it (e.g. if textual | |
40 | * patch output was asked, recursive behaviour is turned on); the callback | |
41 | * set_default in diff_options can be used to tweak this more. | |
42 | * | |
43 | * - As you find different pairs of files, call `diff_change()` to feed | |
44 | * modified files, `diff_addremove()` to feed created or deleted files, or | |
45 | * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API. | |
46 | * These are thin wrappers to a lower-level `diff_queue()` function that is | |
47 | * flexible enough to record any of these kinds of changes. | |
48 | * | |
49 | * - Once you finish feeding the pairs of files, call `diffcore_std()`. | |
50 | * This will tell the diffcore library to go ahead and do its work. | |
51 | * | |
52 | * - Calling `diff_flush()` will produce the output. | |
53 | */ | |
54 | ||
4a1b13a3 NTND |
55 | struct combine_diff_path; |
56 | struct commit; | |
57 | struct diff_filespec; | |
ac1b3d12 | 58 | struct diff_options; |
04245581 | 59 | struct diff_queue_struct; |
910650d2 | 60 | struct oid_array; |
4a288478 | 61 | struct option; |
b78ea5fc | 62 | struct repository; |
4a1b13a3 NTND |
63 | struct rev_info; |
64 | struct strbuf; | |
65 | struct userdiff_driver; | |
72441af7 KS |
66 | |
67 | typedef int (*pathchange_fn_t)(struct diff_options *options, | |
68 | struct combine_diff_path *path); | |
ac1b3d12 LT |
69 | |
70 | typedef void (*change_fn_t)(struct diff_options *options, | |
71 | unsigned old_mode, unsigned new_mode, | |
94a0097a BW |
72 | const struct object_id *old_oid, |
73 | const struct object_id *new_oid, | |
74 | int old_oid_valid, int new_oid_valid, | |
e3d42c47 JL |
75 | const char *fullpath, |
76 | unsigned old_dirty_submodule, unsigned new_dirty_submodule); | |
ac1b3d12 LT |
77 | |
78 | typedef void (*add_remove_fn_t)(struct diff_options *options, | |
79 | int addremove, unsigned mode, | |
c26022ea BW |
80 | const struct object_id *oid, |
81 | int oid_valid, | |
e3d42c47 | 82 | const char *fullpath, unsigned dirty_submodule); |
ac1b3d12 | 83 | |
04245581 JK |
84 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
85 | struct diff_options *options, void *data); | |
86 | ||
a3c158d4 BY |
87 | typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); |
88 | ||
c6744349 TH |
89 | #define DIFF_FORMAT_RAW 0x0001 |
90 | #define DIFF_FORMAT_DIFFSTAT 0x0002 | |
74e2abe5 JH |
91 | #define DIFF_FORMAT_NUMSTAT 0x0004 |
92 | #define DIFF_FORMAT_SUMMARY 0x0008 | |
93 | #define DIFF_FORMAT_PATCH 0x0010 | |
ebd124c6 | 94 | #define DIFF_FORMAT_SHORTSTAT 0x0020 |
7df7c019 | 95 | #define DIFF_FORMAT_DIRSTAT 0x0040 |
c6744349 TH |
96 | |
97 | /* These override all above */ | |
74e2abe5 JH |
98 | #define DIFF_FORMAT_NAME 0x0100 |
99 | #define DIFF_FORMAT_NAME_STATUS 0x0200 | |
100 | #define DIFF_FORMAT_CHECKDIFF 0x0400 | |
c6744349 TH |
101 | |
102 | /* Same as output_format = 0 but we know that -s flag was given | |
103 | * and we should not give default value to output_format. | |
104 | */ | |
74e2abe5 | 105 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
c6744349 | 106 | |
74e2abe5 | 107 | #define DIFF_FORMAT_CALLBACK 0x1000 |
04245581 | 108 | |
02f2f56b BW |
109 | #define DIFF_FLAGS_INIT { 0 } |
110 | struct diff_flags { | |
13c4d7eb HW |
111 | |
112 | /** | |
113 | * Tells if tree traversal done by tree-diff should recursively descend | |
114 | * into a tree object pair that are different in preimage and postimage set. | |
115 | */ | |
2b393ef3 NTND |
116 | unsigned recursive; |
117 | unsigned tree_in_recursive; | |
13c4d7eb HW |
118 | |
119 | /* Affects the way how a file that is seemingly binary is treated. */ | |
2b393ef3 NTND |
120 | unsigned binary; |
121 | unsigned text; | |
13c4d7eb HW |
122 | |
123 | /** | |
124 | * Tells the patch output format not to use abbreviated object names on the | |
125 | * "index" lines. | |
126 | */ | |
2b393ef3 | 127 | unsigned full_index; |
13c4d7eb HW |
128 | |
129 | /* Affects if diff-files shows removed files. */ | |
2b393ef3 | 130 | unsigned silent_on_remove; |
13c4d7eb HW |
131 | |
132 | /** | |
133 | * Tells the diffcore library that the caller is feeding unchanged | |
134 | * filepairs to allow copies from unmodified files be detected. | |
135 | */ | |
2b393ef3 | 136 | unsigned find_copies_harder; |
13c4d7eb | 137 | |
2b393ef3 NTND |
138 | unsigned follow_renames; |
139 | unsigned rename_empty; | |
13c4d7eb HW |
140 | |
141 | /* Internal; used for optimization to see if there is any change. */ | |
2b393ef3 | 142 | unsigned has_changes; |
13c4d7eb | 143 | |
2b393ef3 | 144 | unsigned quick; |
13c4d7eb HW |
145 | |
146 | /** | |
147 | * Tells diff-files that the input is not tracked files but files in random | |
148 | * locations on the filesystem. | |
149 | */ | |
2b393ef3 | 150 | unsigned no_index; |
13c4d7eb HW |
151 | |
152 | /** | |
153 | * Tells output routine that it is Ok to call user specified patch output | |
154 | * routine. Plumbing disables this to ensure stable output. | |
155 | */ | |
2b393ef3 | 156 | unsigned allow_external; |
13c4d7eb HW |
157 | |
158 | /** | |
159 | * For communication between the calling program and the options parser; | |
160 | * tell the calling program to signal the presence of difference using | |
161 | * program exit code. | |
162 | */ | |
2b393ef3 | 163 | unsigned exit_with_status; |
13c4d7eb HW |
164 | |
165 | /** | |
166 | * Tells the library that the calling program is feeding the filepairs | |
167 | * reversed; `one` is two, and `two` is one. | |
168 | */ | |
2b393ef3 | 169 | unsigned reverse_diff; |
13c4d7eb | 170 | |
2b393ef3 NTND |
171 | unsigned check_failed; |
172 | unsigned relative_name; | |
173 | unsigned ignore_submodules; | |
174 | unsigned dirstat_cumulative; | |
175 | unsigned dirstat_by_file; | |
176 | unsigned allow_textconv; | |
177 | unsigned textconv_set_via_cmdline; | |
178 | unsigned diff_from_contents; | |
179 | unsigned dirty_submodules; | |
180 | unsigned ignore_untracked_in_submodules; | |
181 | unsigned ignore_dirty_submodules; | |
182 | unsigned override_submodule_config; | |
183 | unsigned dirstat_by_line; | |
184 | unsigned funccontext; | |
185 | unsigned default_follow_renames; | |
186 | unsigned stat_with_summary; | |
187 | unsigned suppress_diff_headers; | |
188 | unsigned dual_color_diffed_diffs; | |
430be36e | 189 | unsigned suppress_hunk_header_line_count; |
02f2f56b BW |
190 | }; |
191 | ||
192 | static inline void diff_flags_or(struct diff_flags *a, | |
193 | const struct diff_flags *b) | |
194 | { | |
195 | char *tmp_a = (char *)a; | |
196 | const char *tmp_b = (const char *)b; | |
197 | int i; | |
198 | ||
199 | for (i = 0; i < sizeof(struct diff_flags); i++) | |
200 | tmp_a[i] |= tmp_b[i]; | |
201 | } | |
202 | ||
628d5c2b KC |
203 | #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) |
204 | #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) | |
205 | #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) | |
8f67f8ae | 206 | |
307ab20b JH |
207 | #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) |
208 | ||
882749a0 TR |
209 | enum diff_words_type { |
210 | DIFF_WORDS_NONE = 0, | |
211 | DIFF_WORDS_PORCELAIN, | |
212 | DIFF_WORDS_PLAIN, | |
213 | DIFF_WORDS_COLOR | |
214 | }; | |
215 | ||
61cfbc05 JK |
216 | enum diff_submodule_format { |
217 | DIFF_SUBMODULE_SHORT = 0, | |
fd47ae6a JK |
218 | DIFF_SUBMODULE_LOG, |
219 | DIFF_SUBMODULE_INLINE_DIFF | |
61cfbc05 JK |
220 | }; |
221 | ||
13c4d7eb HW |
222 | /** |
223 | * the set of options the calling program wants to affect the operation of | |
224 | * diffcore library with. | |
225 | */ | |
6b5ee137 | 226 | struct diff_options { |
6b5ee137 | 227 | const char *orderfile; |
13c4d7eb HW |
228 | |
229 | /** | |
230 | * A constant string (can and typically does contain newlines to look for | |
231 | * a block of text, not just a single line) to filter out the filepairs | |
232 | * that do not change the number of strings contained in its preimage and | |
233 | * postimage of the diff_queue. | |
234 | */ | |
6b5ee137 | 235 | const char *pickaxe; |
13c4d7eb | 236 | |
2f3f8b21 | 237 | const char *single_follow; |
eab9a40b | 238 | const char *a_prefix, *b_prefix; |
660e113c JK |
239 | const char *line_prefix; |
240 | size_t line_prefix_length; | |
13c4d7eb HW |
241 | |
242 | /** | |
243 | * collection of boolean options that affects the operation, but some do | |
244 | * not have anything to do with the diffcore library. | |
245 | */ | |
02f2f56b | 246 | struct diff_flags flags; |
1ecc1cbd JH |
247 | |
248 | /* diff-filter bits */ | |
249 | unsigned int filter; | |
250 | ||
f1c96261 | 251 | int use_color; |
13c4d7eb HW |
252 | |
253 | /* Number of context lines to generate in patch output. */ | |
ee1e5412 | 254 | int context; |
13c4d7eb | 255 | |
6d0e674a | 256 | int interhunkcontext; |
13c4d7eb HW |
257 | |
258 | /* Affects the way detection logic for complete rewrites, renames and | |
259 | * copies. | |
260 | */ | |
6b5ee137 JH |
261 | int break_opt; |
262 | int detect_rename; | |
13c4d7eb | 263 | |
467ddc14 | 264 | int irreversible_delete; |
fb13227e | 265 | int skip_stat_unmatch; |
6b5ee137 | 266 | int line_termination; |
13c4d7eb HW |
267 | |
268 | /* The output format used when `diff_flush()` is run. */ | |
6b5ee137 | 269 | int output_format; |
13c4d7eb | 270 | |
929ed70a | 271 | unsigned pickaxe_opts; |
13c4d7eb HW |
272 | |
273 | /* Affects the way detection logic for complete rewrites, renames and | |
274 | * copies. | |
275 | */ | |
6b5ee137 | 276 | int rename_score; |
8082d8d3 | 277 | int rename_limit; |
13c4d7eb | 278 | |
bf0ab10f | 279 | int needed_rename_limit; |
f31027c9 | 280 | int degraded_cc_to_c; |
3ac942d4 | 281 | int show_rename_progress; |
712d2c7d | 282 | int dirstat_permille; |
6b5ee137 | 283 | int setup; |
13c4d7eb HW |
284 | |
285 | /* Number of hexdigits to abbreviate raw format output to. */ | |
47dd0d59 | 286 | int abbrev; |
13c4d7eb | 287 | |
e3696980 DS |
288 | /* If non-zero, then stop computing after this many changes. */ |
289 | int max_changes; | |
290 | /* For internal use only. */ | |
291 | int num_changes; | |
292 | ||
425a28e0 | 293 | int ita_invisible_in_index; |
b8767f79 | 294 | /* white-space error highlighting */ |
091f8e28 SB |
295 | #define WSEH_NEW (1<<12) |
296 | #define WSEH_CONTEXT (1<<13) | |
297 | #define WSEH_OLD (1<<14) | |
b8767f79 | 298 | unsigned ws_error_highlight; |
cd676a51 JH |
299 | const char *prefix; |
300 | int prefix_length; | |
698ce6f8 | 301 | const char *stat_sep; |
7f125ff9 | 302 | int xdl_opts; |
ac1b3d12 | 303 | |
2477ab2e JT |
304 | /* see Documentation/diff-options.txt */ |
305 | char **anchors; | |
306 | size_t anchors_nr, anchors_alloc; | |
307 | ||
a2540023 JH |
308 | int stat_width; |
309 | int stat_name_width; | |
969fe57b | 310 | int stat_graph_width; |
808e1db2 | 311 | int stat_count; |
2b6a5417 | 312 | const char *word_regex; |
882749a0 | 313 | enum diff_words_type word_diff; |
61cfbc05 | 314 | enum diff_submodule_format submodule_format; |
a2540023 | 315 | |
15af58c1 SB |
316 | struct oidset *objfind; |
317 | ||
34a5e1a2 JS |
318 | /* this is set by diffcore for DIFF_FORMAT_PATCH */ |
319 | int found_changes; | |
320 | ||
44c48a90 JH |
321 | /* to support internal diff recursion by --follow hack*/ |
322 | int found_follow; | |
323 | ||
13c4d7eb | 324 | /* Callback which allows tweaking the options in diff_setup_done(). */ |
6c374008 JH |
325 | void (*set_default)(struct diff_options *); |
326 | ||
c0c77734 DB |
327 | FILE *file; |
328 | int close_file; | |
329 | ||
7648b79e SB |
330 | #define OUTPUT_INDICATOR_NEW 0 |
331 | #define OUTPUT_INDICATOR_OLD 1 | |
332 | #define OUTPUT_INDICATOR_CONTEXT 2 | |
333 | char output_indicators[3]; | |
334 | ||
66f13625 | 335 | struct pathspec pathspec; |
72441af7 | 336 | pathchange_fn_t pathchange; |
ac1b3d12 LT |
337 | change_fn_t change; |
338 | add_remove_fn_t add_remove; | |
a937b37e | 339 | void *change_fn_data; |
04245581 JK |
340 | diff_format_fn_t format_callback; |
341 | void *format_callback_data; | |
a3c158d4 BY |
342 | diff_prefix_fn_t output_prefix; |
343 | void *output_prefix_data; | |
ee7fb0b1 ZK |
344 | |
345 | int diff_path_counter; | |
e6e045f8 SB |
346 | |
347 | struct emitted_diff_symbols *emitted_symbols; | |
2e2d5ac1 SB |
348 | enum { |
349 | COLOR_MOVED_NO = 0, | |
176841f0 | 350 | COLOR_MOVED_PLAIN = 1, |
51da15eb SB |
351 | COLOR_MOVED_BLOCKS = 2, |
352 | COLOR_MOVED_ZEBRA = 3, | |
353 | COLOR_MOVED_ZEBRA_DIM = 4, | |
2e2d5ac1 SB |
354 | } color_moved; |
355 | #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA | |
f0b8fb6e | 356 | #define COLOR_MOVED_MIN_ALNUM_COUNT 20 |
ca1f4ae4 SB |
357 | |
358 | /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */ | |
359 | #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5) | |
d173e799 SB |
360 | #define COLOR_MOVED_WS_ERROR (1<<0) |
361 | unsigned color_moved_ws_handling; | |
b78ea5fc NTND |
362 | |
363 | struct repository *repo; | |
4a288478 | 364 | struct option *parseopts; |
6b5ee137 JH |
365 | }; |
366 | ||
cdb5330a NTND |
367 | unsigned diff_filter_bit(char status); |
368 | ||
f3597138 SB |
369 | void diff_emit_submodule_del(struct diff_options *o, const char *line); |
370 | void diff_emit_submodule_add(struct diff_options *o, const char *line); | |
371 | void diff_emit_submodule_untracked(struct diff_options *o, const char *path); | |
372 | void diff_emit_submodule_modified(struct diff_options *o, const char *path); | |
373 | void diff_emit_submodule_header(struct diff_options *o, const char *header); | |
374 | void diff_emit_submodule_error(struct diff_options *o, const char *err); | |
375 | void diff_emit_submodule_pipethrough(struct diff_options *o, | |
376 | const char *line, int len); | |
377 | ||
e4cb659e DF |
378 | struct diffstat_t { |
379 | int nr; | |
380 | int alloc; | |
381 | struct diffstat_file { | |
382 | char *from_name; | |
383 | char *name; | |
384 | char *print_name; | |
385 | const char *comments; | |
386 | unsigned is_unmerged:1; | |
387 | unsigned is_binary:1; | |
388 | unsigned is_renamed:1; | |
389 | unsigned is_interesting:1; | |
390 | uintmax_t added, deleted; | |
391 | } **files; | |
392 | }; | |
393 | ||
ce436973 JK |
394 | enum color_diff { |
395 | DIFF_RESET = 0, | |
8dbf3eb6 | 396 | DIFF_CONTEXT = 1, |
ce436973 JK |
397 | DIFF_METAINFO = 2, |
398 | DIFF_FRAGINFO = 3, | |
399 | DIFF_FILE_OLD = 4, | |
400 | DIFF_FILE_NEW = 5, | |
401 | DIFF_COMMIT = 6, | |
448c3ef1 | 402 | DIFF_WHITESPACE = 7, |
2e2d5ac1 SB |
403 | DIFF_FUNCINFO = 8, |
404 | DIFF_FILE_OLD_MOVED = 9, | |
405 | DIFF_FILE_OLD_MOVED_ALT = 10, | |
86b452e2 SB |
406 | DIFF_FILE_OLD_MOVED_DIM = 11, |
407 | DIFF_FILE_OLD_MOVED_ALT_DIM = 12, | |
408 | DIFF_FILE_NEW_MOVED = 13, | |
409 | DIFF_FILE_NEW_MOVED_ALT = 14, | |
410 | DIFF_FILE_NEW_MOVED_DIM = 15, | |
a7be92ac JS |
411 | DIFF_FILE_NEW_MOVED_ALT_DIM = 16, |
412 | DIFF_CONTEXT_DIM = 17, | |
413 | DIFF_FILE_OLD_DIM = 18, | |
414 | DIFF_FILE_NEW_DIM = 19, | |
415 | DIFF_CONTEXT_BOLD = 20, | |
416 | DIFF_FILE_OLD_BOLD = 21, | |
417 | DIFF_FILE_NEW_BOLD = 22, | |
ce436973 | 418 | }; |
13c4d7eb | 419 | |
ce436973 | 420 | const char *diff_get_color(int diff_use_color, enum color_diff ix); |
8f67f8ae | 421 | #define diff_get_color_opt(o, ix) \ |
f1c96261 | 422 | diff_get_color((o)->use_color, ix) |
8f67f8ae | 423 | |
ce436973 | 424 | |
f1922234 JK |
425 | const char *diff_line_prefix(struct diff_options *); |
426 | ||
427 | ||
698ce6f8 JS |
428 | extern const char mime_boundary_leader[]; |
429 | ||
f758a7f8 | 430 | struct combine_diff_path *diff_tree_paths( |
fda94b41 BW |
431 | struct combine_diff_path *p, const struct object_id *oid, |
432 | const struct object_id **parents_oid, int nparent, | |
72441af7 | 433 | struct strbuf *base, struct diff_options *opt); |
f758a7f8 NTND |
434 | int diff_tree_oid(const struct object_id *old_oid, |
435 | const struct object_id *new_oid, | |
436 | const char *base, struct diff_options *opt); | |
437 | int diff_root_tree_oid(const struct object_id *new_oid, const char *base, | |
438 | struct diff_options *opt); | |
ac1b3d12 | 439 | |
ea726d02 JH |
440 | struct combine_diff_path { |
441 | struct combine_diff_path *next; | |
ea726d02 | 442 | char *path; |
2454c962 | 443 | unsigned int mode; |
1ff57c13 | 444 | struct object_id oid; |
2454c962 | 445 | struct combine_diff_parent { |
d416df88 | 446 | char status; |
2454c962 | 447 | unsigned int mode; |
1ff57c13 | 448 | struct object_id oid; |
d76ce4f7 | 449 | struct strbuf path; |
2454c962 | 450 | } parent[FLEX_ARRAY]; |
ea726d02 | 451 | }; |
2454c962 | 452 | #define combine_diff_path_size(n, l) \ |
5b442c4f JK |
453 | st_add4(sizeof(struct combine_diff_path), (l), 1, \ |
454 | st_mult(sizeof(struct combine_diff_parent), (n))) | |
ea726d02 | 455 | |
f758a7f8 NTND |
456 | void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
457 | int dense, struct rev_info *); | |
ea726d02 | 458 | |
f758a7f8 | 459 | void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev); |
0fe7c1de | 460 | |
f758a7f8 | 461 | void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); |
af3feefa | 462 | |
a5a818ee JH |
463 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |
464 | ||
f758a7f8 | 465 | int diff_can_quit_early(struct diff_options *); |
28b9264d | 466 | |
f758a7f8 NTND |
467 | void diff_addremove(struct diff_options *, |
468 | int addremove, | |
469 | unsigned mode, | |
470 | const struct object_id *oid, | |
471 | int oid_valid, | |
472 | const char *fullpath, unsigned dirty_submodule); | |
77eb2720 | 473 | |
f758a7f8 NTND |
474 | void diff_change(struct diff_options *, |
475 | unsigned mode1, unsigned mode2, | |
476 | const struct object_id *old_oid, | |
477 | const struct object_id *new_oid, | |
478 | int old_oid_valid, int new_oid_valid, | |
479 | const char *fullpath, | |
480 | unsigned dirty_submodule1, unsigned dirty_submodule2); | |
77eb2720 | 481 | |
f758a7f8 | 482 | struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); |
77eb2720 | 483 | |
e4cb659e DF |
484 | void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat, |
485 | struct diff_queue_struct *q); | |
486 | void free_diffstat_info(struct diffstat_t *diffstat); | |
487 | ||
19feebc8 | 488 | #define DIFF_SETUP_REVERSE 1 |
f0c6b2a2 | 489 | #define DIFF_SETUP_USE_SIZE_CACHE 4 |
ce240675 | 490 | |
dea007fb | 491 | /* |
b0d12fc9 | 492 | * Poor man's alternative to parse-option, to allow both stuck form |
dea007fb MM |
493 | * (--option=value) and separate form (--option value). |
494 | */ | |
f758a7f8 NTND |
495 | int parse_long_opt(const char *opt, const char **argv, |
496 | const char **optarg); | |
497 | ||
498 | int git_diff_basic_config(const char *var, const char *value, void *cb); | |
499 | int git_diff_heuristic_config(const char *var, const char *value, void *cb); | |
500 | void init_diff_ui_defaults(void); | |
501 | int git_diff_ui_config(const char *var, const char *value, void *cb); | |
e6757652 NTND |
502 | #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS |
503 | #define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts) | |
504 | #endif | |
505 | void repo_diff_setup(struct repository *, struct diff_options *); | |
f758a7f8 NTND |
506 | int diff_opt_parse(struct diff_options *, const char **, int, const char *); |
507 | void diff_setup_done(struct diff_options *); | |
508 | int git_config_rename(const char *var, const char *value); | |
86436c28 | 509 | |
6b14d7fa JH |
510 | #define DIFF_DETECT_RENAME 1 |
511 | #define DIFF_DETECT_COPY 2 | |
512 | ||
367cec1c | 513 | #define DIFF_PICKAXE_ALL 1 |
d01d8c67 | 514 | #define DIFF_PICKAXE_REGEX 2 |
f345b0a0 | 515 | |
f506b8e8 JH |
516 | #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ |
517 | #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ | |
15af58c1 | 518 | #define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */ |
f506b8e8 | 519 | |
15af58c1 SB |
520 | #define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \ |
521 | DIFF_PICKAXE_KIND_G | \ | |
522 | DIFF_PICKAXE_KIND_OBJFIND) | |
cf63051a | 523 | |
c1ddc461 | 524 | #define DIFF_PICKAXE_IGNORE_CASE 32 |
f506b8e8 | 525 | |
f758a7f8 | 526 | void diffcore_std(struct diff_options *); |
784c0dae | 527 | void diffcore_fix_diff_index(void); |
f2ce9fde | 528 | |
dda2d79a JH |
529 | #define COMMON_DIFF_OPTIONS_HELP \ |
530 | "\ncommon diff options:\n" \ | |
8082d8d3 JH |
531 | " -z output diff-raw with lines terminated with NUL.\n" \ |
532 | " -p output patch format.\n" \ | |
533 | " -u synonym for -p.\n" \ | |
5c91da25 PB |
534 | " --patch-with-raw\n" \ |
535 | " output both a patch and the diff-raw format.\n" \ | |
d75f7952 | 536 | " --stat show diffstat instead of patch.\n" \ |
74e2abe5 | 537 | " --numstat show numeric diffstat instead of patch.\n" \ |
29353273 JS |
538 | " --patch-with-stat\n" \ |
539 | " output a patch and prepend its diffstat.\n" \ | |
8082d8d3 | 540 | " --name-only show only names of changed files.\n" \ |
946f5f7c | 541 | " --name-status show names and status of changed files.\n" \ |
47dd0d59 | 542 | " --full-index show full object name on index lines.\n" \ |
913419fc | 543 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
8082d8d3 JH |
544 | " -R swap input file pairs.\n" \ |
545 | " -B detect complete rewrites.\n" \ | |
546 | " -M detect renames.\n" \ | |
547 | " -C detect copies.\n" \ | |
dda2d79a | 548 | " --find-copies-harder\n" \ |
8082d8d3 JH |
549 | " try unchanged files as candidate for copy detection.\n" \ |
550 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
551 | " -O<file> reorder diffs according to the <file>.\n" \ | |
552 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
dda2d79a | 553 | " --pickaxe-all\n" \ |
ca49920f SF |
554 | " show all files diff when -S is used and hit is found.\n" \ |
555 | " -a --text treat all files as text.\n" | |
dda2d79a | 556 | |
f758a7f8 NTND |
557 | int diff_queue_is_empty(void); |
558 | void diff_flush(struct diff_options*); | |
559 | void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); | |
86436c28 | 560 | |
e7baa4f4 | 561 | /* diff-raw status letters */ |
ca8c9156 | 562 | #define DIFF_STATUS_ADDED 'A' |
e7baa4f4 JH |
563 | #define DIFF_STATUS_COPIED 'C' |
564 | #define DIFF_STATUS_DELETED 'D' | |
565 | #define DIFF_STATUS_MODIFIED 'M' | |
566 | #define DIFF_STATUS_RENAMED 'R' | |
567 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
568 | #define DIFF_STATUS_UNKNOWN 'X' | |
569 | #define DIFF_STATUS_UNMERGED 'U' | |
570 | ||
571 | /* these are not diff-raw status letters proper, but used by | |
572 | * diffcore-filter insn to specify additional restrictions. | |
573 | */ | |
0b34379a | 574 | #define DIFF_STATUS_FILTER_AON '*' |
e7baa4f4 JH |
575 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
576 | ||
d5e3b01e JK |
577 | /* |
578 | * This is different from find_unique_abbrev() in that | |
579 | * it stuffs the result with dots for alignment. | |
580 | */ | |
f758a7f8 | 581 | const char *diff_aligned_abbrev(const struct object_id *sha1, int); |
47dd0d59 | 582 | |
4bd5b7da JH |
583 | /* do not report anything on removed paths */ |
584 | #define DIFF_SILENT_ON_REMOVED 01 | |
fb63d7f8 JH |
585 | /* report racily-clean paths as modified */ |
586 | #define DIFF_RACY_IS_MODIFIED 02 | |
f758a7f8 NTND |
587 | int run_diff_files(struct rev_info *revs, unsigned int option); |
588 | int run_diff_index(struct rev_info *revs, int cached); | |
e09ad6e1 | 589 | |
f758a7f8 | 590 | int do_diff_cache(const struct object_id *, struct diff_options *); |
a8f6855f | 591 | int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); |
36261e42 | 592 | void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); |
fcb3d0ad | 593 | |
f758a7f8 | 594 | int diff_result_code(struct diff_options *, int); |
da31b358 | 595 | |
dcd6a8c0 | 596 | int diff_no_index(struct rev_info *, |
16bb3d71 | 597 | int implicit_no_index, int, const char **); |
0569e9b8 | 598 | |
ffc00a48 NTND |
599 | int index_differs_from(struct repository *r, const char *def, |
600 | const struct diff_flags *flags, | |
f758a7f8 | 601 | int ita_invisible_in_index); |
75f3ff2e | 602 | |
a64e6a44 JK |
603 | /* |
604 | * Fill the contents of the filespec "df", respecting any textconv defined by | |
605 | * its userdiff driver. The "driver" parameter must come from a | |
606 | * previous call to get_textconv(), and therefore should either be NULL or have | |
607 | * textconv enabled. | |
608 | * | |
609 | * Note that the memory ownership of the resulting buffer depends on whether | |
610 | * the driver field is NULL. If it is, then the memory belongs to the filespec | |
611 | * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer | |
612 | * that should be freed by the caller. | |
613 | */ | |
6afaf807 NTND |
614 | size_t fill_textconv(struct repository *r, |
615 | struct userdiff_driver *driver, | |
f758a7f8 NTND |
616 | struct diff_filespec *df, |
617 | char **outbuf); | |
a788d7d5 | 618 | |
a64e6a44 JK |
619 | /* |
620 | * Look up the userdiff driver for the given filespec, and return it if | |
621 | * and only if it has textconv enabled (otherwise return NULL). The result | |
622 | * can be passed to fill_textconv(). | |
623 | */ | |
bd7ad45b | 624 | struct userdiff_driver *get_textconv(struct repository *r, |
acd00ea0 | 625 | struct diff_filespec *one); |
a788d7d5 | 626 | |
3a35cb2e JS |
627 | /* |
628 | * Prepare diff_filespec and convert it using diff textconv API | |
629 | * if the textconv driver exists. | |
630 | * Return 1 if the conversion succeeds, 0 otherwise. | |
631 | */ | |
6afaf807 NTND |
632 | int textconv_object(struct repository *repo, |
633 | const char *path, | |
634 | unsigned mode, | |
635 | const struct object_id *oid, int oid_valid, | |
636 | char **buf, unsigned long *buf_size); | |
3a35cb2e | 637 | |
f758a7f8 | 638 | int parse_rename_score(const char **cp_p); |
10ae7526 | 639 | |
f758a7f8 | 640 | long parse_algorithm_value(const char *value); |
07924d4d | 641 | |
f758a7f8 NTND |
642 | void print_stat_summary(FILE *fp, int files, |
643 | int insertions, int deletions); | |
644 | void setup_diff_pager(struct diff_options *); | |
7f814632 | 645 | |
86436c28 | 646 | #endif /* DIFF_H */ |