2 * Copyright (C) 2005 Junio C Hamano
12 struct diff_queue_struct
;
15 struct userdiff_driver
;
19 typedef void (*change_fn_t
)(struct diff_options
*options
,
20 unsigned old_mode
, unsigned new_mode
,
21 const unsigned char *old_sha1
,
22 const unsigned char *new_sha1
,
23 int old_sha1_valid
, int new_sha1_valid
,
25 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
);
27 typedef void (*add_remove_fn_t
)(struct diff_options
*options
,
28 int addremove
, unsigned mode
,
29 const unsigned char *sha1
,
31 const char *fullpath
, unsigned dirty_submodule
);
33 typedef void (*diff_format_fn_t
)(struct diff_queue_struct
*q
,
34 struct diff_options
*options
, void *data
);
36 typedef struct strbuf
*(*diff_prefix_fn_t
)(struct diff_options
*opt
, void *data
);
38 #define DIFF_FORMAT_RAW 0x0001
39 #define DIFF_FORMAT_DIFFSTAT 0x0002
40 #define DIFF_FORMAT_NUMSTAT 0x0004
41 #define DIFF_FORMAT_SUMMARY 0x0008
42 #define DIFF_FORMAT_PATCH 0x0010
43 #define DIFF_FORMAT_SHORTSTAT 0x0020
44 #define DIFF_FORMAT_DIRSTAT 0x0040
46 /* These override all above */
47 #define DIFF_FORMAT_NAME 0x0100
48 #define DIFF_FORMAT_NAME_STATUS 0x0200
49 #define DIFF_FORMAT_CHECKDIFF 0x0400
51 /* Same as output_format = 0 but we know that -s flag was given
52 * and we should not give default value to output_format.
54 #define DIFF_FORMAT_NO_OUTPUT 0x0800
56 #define DIFF_FORMAT_CALLBACK 0x1000
58 #define DIFF_OPT_RECURSIVE (1 << 0)
59 #define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
60 #define DIFF_OPT_BINARY (1 << 2)
61 #define DIFF_OPT_TEXT (1 << 3)
62 #define DIFF_OPT_FULL_INDEX (1 << 4)
63 #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
64 #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
65 #define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
66 #define DIFF_OPT_RENAME_EMPTY (1 << 8)
68 #define DIFF_OPT_HAS_CHANGES (1 << 10)
69 #define DIFF_OPT_QUICK (1 << 11)
70 #define DIFF_OPT_NO_INDEX (1 << 12)
71 #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
72 #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
73 #define DIFF_OPT_REVERSE_DIFF (1 << 15)
74 #define DIFF_OPT_CHECK_FAILED (1 << 16)
75 #define DIFF_OPT_RELATIVE_NAME (1 << 17)
76 #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
77 #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
78 #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
79 #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
80 #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
81 #define DIFF_OPT_SUBMODULE_LOG (1 << 23)
82 #define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
83 #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
84 #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
85 #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
86 #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
87 #define DIFF_OPT_FUNCCONTEXT (1 << 29)
88 #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
90 #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
91 #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
92 #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
93 #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
94 #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
95 #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
97 #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
99 enum diff_words_type
{
101 DIFF_WORDS_PORCELAIN
,
106 struct diff_options
{
108 const char *orderfile
;
110 const char *single_follow
;
111 const char *a_prefix
, *b_prefix
;
115 int interhunkcontext
;
118 int irreversible_delete
;
119 int skip_stat_unmatch
;
120 int line_termination
;
125 int needed_rename_limit
;
126 int degraded_cc_to_c
;
127 int show_rename_progress
;
128 int dirstat_permille
;
133 const char *stat_sep
;
138 int stat_graph_width
;
140 const char *word_regex
;
141 enum diff_words_type word_diff
;
143 /* this is set by diffcore for DIFF_FORMAT_PATCH */
146 /* to support internal diff recursion by --follow hack*/
152 struct pathspec pathspec
;
154 add_remove_fn_t add_remove
;
155 diff_format_fn_t format_callback
;
156 void *format_callback_data
;
157 diff_prefix_fn_t output_prefix
;
158 int output_prefix_length
;
159 void *output_prefix_data
;
173 const char *diff_get_color(int diff_use_color
, enum color_diff ix
);
174 #define diff_get_color_opt(o, ix) \
175 diff_get_color((o)->use_color, ix)
178 const char *diff_line_prefix(struct diff_options
*);
181 extern const char mime_boundary_leader
[];
183 extern void diff_tree_setup_paths(const char **paths
, struct diff_options
*);
184 extern void diff_tree_release_paths(struct diff_options
*);
185 extern int diff_tree(struct tree_desc
*t1
, struct tree_desc
*t2
,
186 const char *base
, struct diff_options
*opt
);
187 extern int diff_tree_sha1(const unsigned char *old
, const unsigned char *new,
188 const char *base
, struct diff_options
*opt
);
189 extern int diff_root_tree_sha1(const unsigned char *new, const char *base
,
190 struct diff_options
*opt
);
192 struct combine_diff_path
{
193 struct combine_diff_path
*next
;
197 unsigned char sha1
[20];
198 struct combine_diff_parent
{
201 unsigned char sha1
[20];
202 } parent
[FLEX_ARRAY
];
204 #define combine_diff_path_size(n, l) \
205 (sizeof(struct combine_diff_path) + \
206 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
208 extern void show_combined_diff(struct combine_diff_path
*elem
, int num_parent
,
209 int dense
, struct rev_info
*);
211 extern void diff_tree_combined(const unsigned char *sha1
, const struct sha1_array
*parents
, int dense
, struct rev_info
*rev
);
213 extern void diff_tree_combined_merge(const struct commit
*commit
, int dense
, struct rev_info
*rev
);
215 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
);
217 extern int diff_can_quit_early(struct diff_options
*);
219 extern void diff_addremove(struct diff_options
*,
222 const unsigned char *sha1
,
224 const char *fullpath
, unsigned dirty_submodule
);
226 extern void diff_change(struct diff_options
*,
227 unsigned mode1
, unsigned mode2
,
228 const unsigned char *sha1
,
229 const unsigned char *sha2
,
232 const char *fullpath
,
233 unsigned dirty_submodule1
, unsigned dirty_submodule2
);
235 extern struct diff_filepair
*diff_unmerge(struct diff_options
*, const char *path
);
237 #define DIFF_SETUP_REVERSE 1
238 #define DIFF_SETUP_USE_CACHE 2
239 #define DIFF_SETUP_USE_SIZE_CACHE 4
242 * Poor man's alternative to parse-option, to allow both sticked form
243 * (--option=value) and separate form (--option value).
245 extern int parse_long_opt(const char *opt
, const char **argv
,
246 const char **optarg
);
248 extern int git_diff_basic_config(const char *var
, const char *value
, void *cb
);
249 extern int git_diff_ui_config(const char *var
, const char *value
, void *cb
);
250 extern void diff_setup(struct diff_options
*);
251 extern int diff_opt_parse(struct diff_options
*, const char **, int);
252 extern void diff_setup_done(struct diff_options
*);
254 #define DIFF_DETECT_RENAME 1
255 #define DIFF_DETECT_COPY 2
257 #define DIFF_PICKAXE_ALL 1
258 #define DIFF_PICKAXE_REGEX 2
260 #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
261 #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
263 extern void diffcore_std(struct diff_options
*);
264 extern void diffcore_fix_diff_index(struct diff_options
*);
266 #define COMMON_DIFF_OPTIONS_HELP \
267 "\ncommon diff options:\n" \
268 " -z output diff-raw with lines terminated with NUL.\n" \
269 " -p output patch format.\n" \
270 " -u synonym for -p.\n" \
271 " --patch-with-raw\n" \
272 " output both a patch and the diff-raw format.\n" \
273 " --stat show diffstat instead of patch.\n" \
274 " --numstat show numeric diffstat instead of patch.\n" \
275 " --patch-with-stat\n" \
276 " output a patch and prepend its diffstat.\n" \
277 " --name-only show only names of changed files.\n" \
278 " --name-status show names and status of changed files.\n" \
279 " --full-index show full object name on index lines.\n" \
280 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
281 " -R swap input file pairs.\n" \
282 " -B detect complete rewrites.\n" \
283 " -M detect renames.\n" \
284 " -C detect copies.\n" \
285 " --find-copies-harder\n" \
286 " try unchanged files as candidate for copy detection.\n" \
287 " -l<n> limit rename attempts up to <n> paths.\n" \
288 " -O<file> reorder diffs according to the <file>.\n" \
289 " -S<string> find filepair whose only one side contains the string.\n" \
291 " show all files diff when -S is used and hit is found.\n" \
292 " -a --text treat all files as text.\n"
294 extern int diff_queue_is_empty(void);
295 extern void diff_flush(struct diff_options
*);
296 extern void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
);
298 /* diff-raw status letters */
299 #define DIFF_STATUS_ADDED 'A'
300 #define DIFF_STATUS_COPIED 'C'
301 #define DIFF_STATUS_DELETED 'D'
302 #define DIFF_STATUS_MODIFIED 'M'
303 #define DIFF_STATUS_RENAMED 'R'
304 #define DIFF_STATUS_TYPE_CHANGED 'T'
305 #define DIFF_STATUS_UNKNOWN 'X'
306 #define DIFF_STATUS_UNMERGED 'U'
308 /* these are not diff-raw status letters proper, but used by
309 * diffcore-filter insn to specify additional restrictions.
311 #define DIFF_STATUS_FILTER_AON '*'
312 #define DIFF_STATUS_FILTER_BROKEN 'B'
314 extern const char *diff_unique_abbrev(const unsigned char *, int);
316 /* do not report anything on removed paths */
317 #define DIFF_SILENT_ON_REMOVED 01
318 /* report racily-clean paths as modified */
319 #define DIFF_RACY_IS_MODIFIED 02
320 extern int run_diff_files(struct rev_info
*revs
, unsigned int option
);
321 extern int run_diff_index(struct rev_info
*revs
, int cached
);
323 extern int do_diff_cache(const unsigned char *, struct diff_options
*);
324 extern int diff_flush_patch_id(struct diff_options
*, unsigned char *);
326 extern int diff_result_code(struct diff_options
*, int);
328 extern void diff_no_index(struct rev_info
*, int, const char **, int, const char *);
330 extern int index_differs_from(const char *def
, int diff_flags
);
332 extern size_t fill_textconv(struct userdiff_driver
*driver
,
333 struct diff_filespec
*df
,
336 extern struct userdiff_driver
*get_textconv(struct diff_filespec
*one
);
338 extern int parse_rename_score(const char **cp_p
);
340 extern long parse_algorithm_value(const char *value
);
342 extern int print_stat_summary(FILE *fp
, int files
,
343 int insertions
, int deletions
);
344 extern void setup_diff_pager(struct diff_options
*);