]>
Commit | Line | Data |
---|---|---|
1 | /* | |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
4 | #ifndef DIFF_H | |
5 | #define DIFF_H | |
6 | ||
7 | #include "tree-walk.h" | |
8 | #include "pathspec.h" | |
9 | #include "object.h" | |
10 | #include "oidset.h" | |
11 | ||
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 | ||
55 | struct combine_diff_path; | |
56 | struct commit; | |
57 | struct diff_filespec; | |
58 | struct diff_options; | |
59 | struct diff_queue_struct; | |
60 | struct oid_array; | |
61 | struct option; | |
62 | struct repository; | |
63 | struct rev_info; | |
64 | struct strbuf; | |
65 | struct userdiff_driver; | |
66 | ||
67 | typedef int (*pathchange_fn_t)(struct diff_options *options, | |
68 | struct combine_diff_path *path); | |
69 | ||
70 | typedef void (*change_fn_t)(struct diff_options *options, | |
71 | unsigned old_mode, unsigned new_mode, | |
72 | const struct object_id *old_oid, | |
73 | const struct object_id *new_oid, | |
74 | int old_oid_valid, int new_oid_valid, | |
75 | const char *fullpath, | |
76 | unsigned old_dirty_submodule, unsigned new_dirty_submodule); | |
77 | ||
78 | typedef void (*add_remove_fn_t)(struct diff_options *options, | |
79 | int addremove, unsigned mode, | |
80 | const struct object_id *oid, | |
81 | int oid_valid, | |
82 | const char *fullpath, unsigned dirty_submodule); | |
83 | ||
84 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, | |
85 | struct diff_options *options, void *data); | |
86 | ||
87 | typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); | |
88 | ||
89 | #define DIFF_FORMAT_RAW 0x0001 | |
90 | #define DIFF_FORMAT_DIFFSTAT 0x0002 | |
91 | #define DIFF_FORMAT_NUMSTAT 0x0004 | |
92 | #define DIFF_FORMAT_SUMMARY 0x0008 | |
93 | #define DIFF_FORMAT_PATCH 0x0010 | |
94 | #define DIFF_FORMAT_SHORTSTAT 0x0020 | |
95 | #define DIFF_FORMAT_DIRSTAT 0x0040 | |
96 | ||
97 | /* These override all above */ | |
98 | #define DIFF_FORMAT_NAME 0x0100 | |
99 | #define DIFF_FORMAT_NAME_STATUS 0x0200 | |
100 | #define DIFF_FORMAT_CHECKDIFF 0x0400 | |
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 | */ | |
105 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 | |
106 | ||
107 | #define DIFF_FORMAT_CALLBACK 0x1000 | |
108 | ||
109 | #define DIFF_FLAGS_INIT { 0 } | |
110 | struct diff_flags { | |
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 | */ | |
116 | unsigned recursive; | |
117 | unsigned tree_in_recursive; | |
118 | ||
119 | /* Affects the way how a file that is seemingly binary is treated. */ | |
120 | unsigned binary; | |
121 | unsigned text; | |
122 | ||
123 | /** | |
124 | * Tells the patch output format not to use abbreviated object names on the | |
125 | * "index" lines. | |
126 | */ | |
127 | unsigned full_index; | |
128 | ||
129 | /* Affects if diff-files shows removed files. */ | |
130 | unsigned silent_on_remove; | |
131 | ||
132 | /** | |
133 | * Tells the diffcore library that the caller is feeding unchanged | |
134 | * filepairs to allow copies from unmodified files be detected. | |
135 | */ | |
136 | unsigned find_copies_harder; | |
137 | ||
138 | unsigned follow_renames; | |
139 | unsigned rename_empty; | |
140 | ||
141 | /* Internal; used for optimization to see if there is any change. */ | |
142 | unsigned has_changes; | |
143 | ||
144 | unsigned quick; | |
145 | ||
146 | /** | |
147 | * Tells diff-files that the input is not tracked files but files in random | |
148 | * locations on the filesystem. | |
149 | */ | |
150 | unsigned no_index; | |
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 | */ | |
156 | unsigned allow_external; | |
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 | */ | |
163 | unsigned exit_with_status; | |
164 | ||
165 | /** | |
166 | * Tells the library that the calling program is feeding the filepairs | |
167 | * reversed; `one` is two, and `two` is one. | |
168 | */ | |
169 | unsigned reverse_diff; | |
170 | ||
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; | |
189 | unsigned suppress_hunk_header_line_count; | |
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 | ||
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) | |
206 | ||
207 | #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) | |
208 | ||
209 | enum diff_words_type { | |
210 | DIFF_WORDS_NONE = 0, | |
211 | DIFF_WORDS_PORCELAIN, | |
212 | DIFF_WORDS_PLAIN, | |
213 | DIFF_WORDS_COLOR | |
214 | }; | |
215 | ||
216 | enum diff_submodule_format { | |
217 | DIFF_SUBMODULE_SHORT = 0, | |
218 | DIFF_SUBMODULE_LOG, | |
219 | DIFF_SUBMODULE_INLINE_DIFF | |
220 | }; | |
221 | ||
222 | /** | |
223 | * the set of options the calling program wants to affect the operation of | |
224 | * diffcore library with. | |
225 | */ | |
226 | struct diff_options { | |
227 | const char *orderfile; | |
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 | */ | |
235 | const char *pickaxe; | |
236 | ||
237 | /* -I<regex> */ | |
238 | regex_t **ignore_regex; | |
239 | size_t ignore_regex_nr, ignore_regex_alloc; | |
240 | ||
241 | const char *single_follow; | |
242 | const char *a_prefix, *b_prefix; | |
243 | const char *line_prefix; | |
244 | size_t line_prefix_length; | |
245 | ||
246 | /** | |
247 | * collection of boolean options that affects the operation, but some do | |
248 | * not have anything to do with the diffcore library. | |
249 | */ | |
250 | struct diff_flags flags; | |
251 | ||
252 | /* diff-filter bits */ | |
253 | unsigned int filter; | |
254 | ||
255 | int use_color; | |
256 | ||
257 | /* Number of context lines to generate in patch output. */ | |
258 | int context; | |
259 | ||
260 | int interhunkcontext; | |
261 | ||
262 | /* Affects the way detection logic for complete rewrites, renames and | |
263 | * copies. | |
264 | */ | |
265 | int break_opt; | |
266 | int detect_rename; | |
267 | ||
268 | int irreversible_delete; | |
269 | int skip_stat_unmatch; | |
270 | int line_termination; | |
271 | ||
272 | /* The output format used when `diff_flush()` is run. */ | |
273 | int output_format; | |
274 | ||
275 | unsigned pickaxe_opts; | |
276 | ||
277 | /* Affects the way detection logic for complete rewrites, renames and | |
278 | * copies. | |
279 | */ | |
280 | int rename_score; | |
281 | int rename_limit; | |
282 | ||
283 | int needed_rename_limit; | |
284 | int degraded_cc_to_c; | |
285 | int show_rename_progress; | |
286 | int dirstat_permille; | |
287 | int setup; | |
288 | ||
289 | /* Number of hexdigits to abbreviate raw format output to. */ | |
290 | int abbrev; | |
291 | ||
292 | /* If non-zero, then stop computing after this many changes. */ | |
293 | int max_changes; | |
294 | ||
295 | int ita_invisible_in_index; | |
296 | /* white-space error highlighting */ | |
297 | #define WSEH_NEW (1<<12) | |
298 | #define WSEH_CONTEXT (1<<13) | |
299 | #define WSEH_OLD (1<<14) | |
300 | unsigned ws_error_highlight; | |
301 | const char *prefix; | |
302 | int prefix_length; | |
303 | const char *stat_sep; | |
304 | int xdl_opts; | |
305 | ||
306 | /* see Documentation/diff-options.txt */ | |
307 | char **anchors; | |
308 | size_t anchors_nr, anchors_alloc; | |
309 | ||
310 | int stat_width; | |
311 | int stat_name_width; | |
312 | int stat_graph_width; | |
313 | int stat_count; | |
314 | const char *word_regex; | |
315 | enum diff_words_type word_diff; | |
316 | enum diff_submodule_format submodule_format; | |
317 | ||
318 | struct oidset *objfind; | |
319 | ||
320 | /* this is set by diffcore for DIFF_FORMAT_PATCH */ | |
321 | int found_changes; | |
322 | ||
323 | /* to support internal diff recursion by --follow hack*/ | |
324 | int found_follow; | |
325 | ||
326 | /* Callback which allows tweaking the options in diff_setup_done(). */ | |
327 | void (*set_default)(struct diff_options *); | |
328 | ||
329 | FILE *file; | |
330 | int close_file; | |
331 | ||
332 | #define OUTPUT_INDICATOR_NEW 0 | |
333 | #define OUTPUT_INDICATOR_OLD 1 | |
334 | #define OUTPUT_INDICATOR_CONTEXT 2 | |
335 | char output_indicators[3]; | |
336 | ||
337 | struct pathspec pathspec; | |
338 | pathchange_fn_t pathchange; | |
339 | change_fn_t change; | |
340 | add_remove_fn_t add_remove; | |
341 | void *change_fn_data; | |
342 | diff_format_fn_t format_callback; | |
343 | void *format_callback_data; | |
344 | diff_prefix_fn_t output_prefix; | |
345 | void *output_prefix_data; | |
346 | ||
347 | int diff_path_counter; | |
348 | ||
349 | struct emitted_diff_symbols *emitted_symbols; | |
350 | enum { | |
351 | COLOR_MOVED_NO = 0, | |
352 | COLOR_MOVED_PLAIN = 1, | |
353 | COLOR_MOVED_BLOCKS = 2, | |
354 | COLOR_MOVED_ZEBRA = 3, | |
355 | COLOR_MOVED_ZEBRA_DIM = 4, | |
356 | } color_moved; | |
357 | #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA | |
358 | #define COLOR_MOVED_MIN_ALNUM_COUNT 20 | |
359 | ||
360 | /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */ | |
361 | #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5) | |
362 | #define COLOR_MOVED_WS_ERROR (1<<0) | |
363 | unsigned color_moved_ws_handling; | |
364 | ||
365 | struct repository *repo; | |
366 | struct option *parseopts; | |
367 | }; | |
368 | ||
369 | unsigned diff_filter_bit(char status); | |
370 | ||
371 | void diff_emit_submodule_del(struct diff_options *o, const char *line); | |
372 | void diff_emit_submodule_add(struct diff_options *o, const char *line); | |
373 | void diff_emit_submodule_untracked(struct diff_options *o, const char *path); | |
374 | void diff_emit_submodule_modified(struct diff_options *o, const char *path); | |
375 | void diff_emit_submodule_header(struct diff_options *o, const char *header); | |
376 | void diff_emit_submodule_error(struct diff_options *o, const char *err); | |
377 | void diff_emit_submodule_pipethrough(struct diff_options *o, | |
378 | const char *line, int len); | |
379 | ||
380 | struct diffstat_t { | |
381 | int nr; | |
382 | int alloc; | |
383 | struct diffstat_file { | |
384 | char *from_name; | |
385 | char *name; | |
386 | char *print_name; | |
387 | const char *comments; | |
388 | unsigned is_unmerged:1; | |
389 | unsigned is_binary:1; | |
390 | unsigned is_renamed:1; | |
391 | unsigned is_interesting:1; | |
392 | uintmax_t added, deleted; | |
393 | } **files; | |
394 | }; | |
395 | ||
396 | enum color_diff { | |
397 | DIFF_RESET = 0, | |
398 | DIFF_CONTEXT = 1, | |
399 | DIFF_METAINFO = 2, | |
400 | DIFF_FRAGINFO = 3, | |
401 | DIFF_FILE_OLD = 4, | |
402 | DIFF_FILE_NEW = 5, | |
403 | DIFF_COMMIT = 6, | |
404 | DIFF_WHITESPACE = 7, | |
405 | DIFF_FUNCINFO = 8, | |
406 | DIFF_FILE_OLD_MOVED = 9, | |
407 | DIFF_FILE_OLD_MOVED_ALT = 10, | |
408 | DIFF_FILE_OLD_MOVED_DIM = 11, | |
409 | DIFF_FILE_OLD_MOVED_ALT_DIM = 12, | |
410 | DIFF_FILE_NEW_MOVED = 13, | |
411 | DIFF_FILE_NEW_MOVED_ALT = 14, | |
412 | DIFF_FILE_NEW_MOVED_DIM = 15, | |
413 | DIFF_FILE_NEW_MOVED_ALT_DIM = 16, | |
414 | DIFF_CONTEXT_DIM = 17, | |
415 | DIFF_FILE_OLD_DIM = 18, | |
416 | DIFF_FILE_NEW_DIM = 19, | |
417 | DIFF_CONTEXT_BOLD = 20, | |
418 | DIFF_FILE_OLD_BOLD = 21, | |
419 | DIFF_FILE_NEW_BOLD = 22, | |
420 | }; | |
421 | ||
422 | const char *diff_get_color(int diff_use_color, enum color_diff ix); | |
423 | #define diff_get_color_opt(o, ix) \ | |
424 | diff_get_color((o)->use_color, ix) | |
425 | ||
426 | ||
427 | const char *diff_line_prefix(struct diff_options *); | |
428 | ||
429 | ||
430 | extern const char mime_boundary_leader[]; | |
431 | ||
432 | struct combine_diff_path *diff_tree_paths( | |
433 | struct combine_diff_path *p, const struct object_id *oid, | |
434 | const struct object_id **parents_oid, int nparent, | |
435 | struct strbuf *base, struct diff_options *opt); | |
436 | void diff_tree_oid(const struct object_id *old_oid, | |
437 | const struct object_id *new_oid, | |
438 | const char *base, struct diff_options *opt); | |
439 | void diff_root_tree_oid(const struct object_id *new_oid, const char *base, | |
440 | struct diff_options *opt); | |
441 | ||
442 | struct combine_diff_path { | |
443 | struct combine_diff_path *next; | |
444 | char *path; | |
445 | unsigned int mode; | |
446 | struct object_id oid; | |
447 | struct combine_diff_parent { | |
448 | char status; | |
449 | unsigned int mode; | |
450 | struct object_id oid; | |
451 | struct strbuf path; | |
452 | } parent[FLEX_ARRAY]; | |
453 | }; | |
454 | #define combine_diff_path_size(n, l) \ | |
455 | st_add4(sizeof(struct combine_diff_path), (l), 1, \ | |
456 | st_mult(sizeof(struct combine_diff_parent), (n))) | |
457 | ||
458 | void show_combined_diff(struct combine_diff_path *elem, int num_parent, | |
459 | struct rev_info *); | |
460 | ||
461 | void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev); | |
462 | ||
463 | void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev); | |
464 | ||
465 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); | |
466 | ||
467 | int diff_can_quit_early(struct diff_options *); | |
468 | ||
469 | void diff_addremove(struct diff_options *, | |
470 | int addremove, | |
471 | unsigned mode, | |
472 | const struct object_id *oid, | |
473 | int oid_valid, | |
474 | const char *fullpath, unsigned dirty_submodule); | |
475 | ||
476 | void diff_change(struct diff_options *, | |
477 | unsigned mode1, unsigned mode2, | |
478 | const struct object_id *old_oid, | |
479 | const struct object_id *new_oid, | |
480 | int old_oid_valid, int new_oid_valid, | |
481 | const char *fullpath, | |
482 | unsigned dirty_submodule1, unsigned dirty_submodule2); | |
483 | ||
484 | struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); | |
485 | ||
486 | void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat, | |
487 | struct diff_queue_struct *q); | |
488 | void free_diffstat_info(struct diffstat_t *diffstat); | |
489 | ||
490 | #define DIFF_SETUP_REVERSE 1 | |
491 | #define DIFF_SETUP_USE_SIZE_CACHE 4 | |
492 | ||
493 | /* | |
494 | * Poor man's alternative to parse-option, to allow both stuck form | |
495 | * (--option=value) and separate form (--option value). | |
496 | */ | |
497 | int parse_long_opt(const char *opt, const char **argv, | |
498 | const char **optarg); | |
499 | ||
500 | int git_diff_basic_config(const char *var, const char *value, void *cb); | |
501 | int git_diff_heuristic_config(const char *var, const char *value, void *cb); | |
502 | void init_diff_ui_defaults(void); | |
503 | int git_diff_ui_config(const char *var, const char *value, void *cb); | |
504 | #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS | |
505 | #define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts) | |
506 | #endif | |
507 | void repo_diff_setup(struct repository *, struct diff_options *); | |
508 | int diff_opt_parse(struct diff_options *, const char **, int, const char *); | |
509 | void diff_setup_done(struct diff_options *); | |
510 | int git_config_rename(const char *var, const char *value); | |
511 | ||
512 | #define DIFF_DETECT_RENAME 1 | |
513 | #define DIFF_DETECT_COPY 2 | |
514 | ||
515 | #define DIFF_PICKAXE_ALL 1 | |
516 | #define DIFF_PICKAXE_REGEX 2 | |
517 | ||
518 | #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ | |
519 | #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ | |
520 | #define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */ | |
521 | ||
522 | #define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \ | |
523 | DIFF_PICKAXE_KIND_G | \ | |
524 | DIFF_PICKAXE_KIND_OBJFIND) | |
525 | ||
526 | #define DIFF_PICKAXE_IGNORE_CASE 32 | |
527 | ||
528 | void diffcore_std(struct diff_options *); | |
529 | void diffcore_fix_diff_index(void); | |
530 | ||
531 | #define COMMON_DIFF_OPTIONS_HELP \ | |
532 | "\ncommon diff options:\n" \ | |
533 | " -z output diff-raw with lines terminated with NUL.\n" \ | |
534 | " -p output patch format.\n" \ | |
535 | " -u synonym for -p.\n" \ | |
536 | " --patch-with-raw\n" \ | |
537 | " output both a patch and the diff-raw format.\n" \ | |
538 | " --stat show diffstat instead of patch.\n" \ | |
539 | " --numstat show numeric diffstat instead of patch.\n" \ | |
540 | " --patch-with-stat\n" \ | |
541 | " output a patch and prepend its diffstat.\n" \ | |
542 | " --name-only show only names of changed files.\n" \ | |
543 | " --name-status show names and status of changed files.\n" \ | |
544 | " --full-index show full object name on index lines.\n" \ | |
545 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ | |
546 | " -R swap input file pairs.\n" \ | |
547 | " -B detect complete rewrites.\n" \ | |
548 | " -M detect renames.\n" \ | |
549 | " -C detect copies.\n" \ | |
550 | " --find-copies-harder\n" \ | |
551 | " try unchanged files as candidate for copy detection.\n" \ | |
552 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
553 | " -O<file> reorder diffs according to the <file>.\n" \ | |
554 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
555 | " --pickaxe-all\n" \ | |
556 | " show all files diff when -S is used and hit is found.\n" \ | |
557 | " -a --text treat all files as text.\n" | |
558 | ||
559 | int diff_queue_is_empty(void); | |
560 | void diff_flush(struct diff_options*); | |
561 | void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); | |
562 | ||
563 | /* diff-raw status letters */ | |
564 | #define DIFF_STATUS_ADDED 'A' | |
565 | #define DIFF_STATUS_COPIED 'C' | |
566 | #define DIFF_STATUS_DELETED 'D' | |
567 | #define DIFF_STATUS_MODIFIED 'M' | |
568 | #define DIFF_STATUS_RENAMED 'R' | |
569 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
570 | #define DIFF_STATUS_UNKNOWN 'X' | |
571 | #define DIFF_STATUS_UNMERGED 'U' | |
572 | ||
573 | /* these are not diff-raw status letters proper, but used by | |
574 | * diffcore-filter insn to specify additional restrictions. | |
575 | */ | |
576 | #define DIFF_STATUS_FILTER_AON '*' | |
577 | #define DIFF_STATUS_FILTER_BROKEN 'B' | |
578 | ||
579 | /* | |
580 | * This is different from find_unique_abbrev() in that | |
581 | * it stuffs the result with dots for alignment. | |
582 | */ | |
583 | const char *diff_aligned_abbrev(const struct object_id *sha1, int); | |
584 | ||
585 | void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb); | |
586 | ||
587 | /* do not report anything on removed paths */ | |
588 | #define DIFF_SILENT_ON_REMOVED 01 | |
589 | /* report racily-clean paths as modified */ | |
590 | #define DIFF_RACY_IS_MODIFIED 02 | |
591 | int run_diff_files(struct rev_info *revs, unsigned int option); | |
592 | ||
593 | #define DIFF_INDEX_CACHED 01 | |
594 | #define DIFF_INDEX_MERGE_BASE 02 | |
595 | int run_diff_index(struct rev_info *revs, unsigned int option); | |
596 | ||
597 | int do_diff_cache(const struct object_id *, struct diff_options *); | |
598 | int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); | |
599 | void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); | |
600 | ||
601 | int diff_result_code(struct diff_options *, int); | |
602 | ||
603 | int diff_no_index(struct rev_info *, | |
604 | int implicit_no_index, int, const char **); | |
605 | ||
606 | int index_differs_from(struct repository *r, const char *def, | |
607 | const struct diff_flags *flags, | |
608 | int ita_invisible_in_index); | |
609 | ||
610 | /* | |
611 | * Emit an interdiff of two object ID's to 'diff_options.file' optionally | |
612 | * indented by 'indent' spaces. | |
613 | */ | |
614 | void show_interdiff(const struct object_id *, const struct object_id *, | |
615 | int indent, struct diff_options *); | |
616 | ||
617 | /* | |
618 | * Fill the contents of the filespec "df", respecting any textconv defined by | |
619 | * its userdiff driver. The "driver" parameter must come from a | |
620 | * previous call to get_textconv(), and therefore should either be NULL or have | |
621 | * textconv enabled. | |
622 | * | |
623 | * Note that the memory ownership of the resulting buffer depends on whether | |
624 | * the driver field is NULL. If it is, then the memory belongs to the filespec | |
625 | * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer | |
626 | * that should be freed by the caller. | |
627 | */ | |
628 | size_t fill_textconv(struct repository *r, | |
629 | struct userdiff_driver *driver, | |
630 | struct diff_filespec *df, | |
631 | char **outbuf); | |
632 | ||
633 | /* | |
634 | * Look up the userdiff driver for the given filespec, and return it if | |
635 | * and only if it has textconv enabled (otherwise return NULL). The result | |
636 | * can be passed to fill_textconv(). | |
637 | */ | |
638 | struct userdiff_driver *get_textconv(struct repository *r, | |
639 | struct diff_filespec *one); | |
640 | ||
641 | /* | |
642 | * Prepare diff_filespec and convert it using diff textconv API | |
643 | * if the textconv driver exists. | |
644 | * Return 1 if the conversion succeeds, 0 otherwise. | |
645 | */ | |
646 | int textconv_object(struct repository *repo, | |
647 | const char *path, | |
648 | unsigned mode, | |
649 | const struct object_id *oid, int oid_valid, | |
650 | char **buf, unsigned long *buf_size); | |
651 | ||
652 | int parse_rename_score(const char **cp_p); | |
653 | ||
654 | long parse_algorithm_value(const char *value); | |
655 | ||
656 | void print_stat_summary(FILE *fp, int files, | |
657 | int insertions, int deletions); | |
658 | void setup_diff_pager(struct diff_options *); | |
659 | ||
660 | #endif /* DIFF_H */ |