1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#ifndef DIFF_H
5#define DIFF_H
6#include "tree-walk.h"
8struct rev_info;
10struct diff_options;
11struct diff_queue_struct;
12struct strbuf;
13struct diff_filespec;
14struct userdiff_driver;
15typedef void (*change_fn_t)(struct diff_options *options,
17 unsigned old_mode, unsigned new_mode,
18 const unsigned char *old_sha1,
19 const unsigned char *new_sha1,
20 const char *fullpath,
21 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
22typedef void (*add_remove_fn_t)(struct diff_options *options,
24 int addremove, unsigned mode,
25 const unsigned char *sha1,
26 const char *fullpath, unsigned dirty_submodule);
27typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
29 struct diff_options *options, void *data);
30typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
32#define DIFF_FORMAT_RAW 0x0001
34#define DIFF_FORMAT_DIFFSTAT 0x0002
35#define DIFF_FORMAT_NUMSTAT 0x0004
36#define DIFF_FORMAT_SUMMARY 0x0008
37#define DIFF_FORMAT_PATCH 0x0010
38#define DIFF_FORMAT_SHORTSTAT 0x0020
39#define DIFF_FORMAT_DIRSTAT 0x0040
40/* These override all above */
42#define DIFF_FORMAT_NAME 0x0100
43#define DIFF_FORMAT_NAME_STATUS 0x0200
44#define DIFF_FORMAT_CHECKDIFF 0x0400
45/* Same as output_format = 0 but we know that -s flag was given
47 * and we should not give default value to output_format.
48 */
49#define DIFF_FORMAT_NO_OUTPUT 0x0800
50#define DIFF_FORMAT_CALLBACK 0x1000
52#define DIFF_OPT_RECURSIVE (1 << 0)
54#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
55#define DIFF_OPT_BINARY (1 << 2)
56#define DIFF_OPT_TEXT (1 << 3)
57#define DIFF_OPT_FULL_INDEX (1 << 4)
58#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
59#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
60#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
61#define DIFF_OPT_COLOR_DIFF (1 << 8)
62/* (1 << 9) unused */
63#define DIFF_OPT_HAS_CHANGES (1 << 10)
64#define DIFF_OPT_QUICK (1 << 11)
65#define DIFF_OPT_NO_INDEX (1 << 12)
66#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
67#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
68#define DIFF_OPT_REVERSE_DIFF (1 << 15)
69#define DIFF_OPT_CHECK_FAILED (1 << 16)
70#define DIFF_OPT_RELATIVE_NAME (1 << 17)
71#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
72#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
73#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
74#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
75#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
76#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
77#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
78#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
79#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
80#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
82#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
83#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
84#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
85#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
86#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
87enum diff_words_type {
89 DIFF_WORDS_NONE = 0,
90 DIFF_WORDS_PORCELAIN,
91 DIFF_WORDS_PLAIN,
92 DIFF_WORDS_COLOR
93};
94struct diff_options {
96 const char *filter;
97 const char *orderfile;
98 const char *pickaxe;
99 const char *single_follow;
100 const char *a_prefix, *b_prefix;
101 unsigned flags;
102 int context;
103 int interhunkcontext;
104 int break_opt;
105 int detect_rename;
106 int skip_stat_unmatch;
107 int line_termination;
108 int output_format;
109 int pickaxe_opts;
110 int rename_score;
111 int rename_limit;
112 int warn_on_too_large_rename;
113 int dirstat_percent;
114 int setup;
115 int abbrev;
116 const char *prefix;
117 int prefix_length;
118 const char *stat_sep;
119 long xdl_opts;
120 int stat_width;
122 int stat_name_width;
123 const char *word_regex;
124 enum diff_words_type word_diff;
125 /* this is set by diffcore for DIFF_FORMAT_PATCH */
127 int found_changes;
128 FILE *file;
130 int close_file;
131 int nr_paths;
133 const char **paths;
134 int *pathlens;
135 change_fn_t change;
136 add_remove_fn_t add_remove;
137 diff_format_fn_t format_callback;
138 void *format_callback_data;
139 diff_prefix_fn_t output_prefix;
140 void *output_prefix_data;
141};
142enum color_diff {
144 DIFF_RESET = 0,
145 DIFF_PLAIN = 1,
146 DIFF_METAINFO = 2,
147 DIFF_FRAGINFO = 3,
148 DIFF_FILE_OLD = 4,
149 DIFF_FILE_NEW = 5,
150 DIFF_COMMIT = 6,
151 DIFF_WHITESPACE = 7,
152 DIFF_FUNCINFO = 8
153};
154const char *diff_get_color(int diff_use_color, enum color_diff ix);
155#define diff_get_color_opt(o, ix) \
156 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
157extern const char mime_boundary_leader[];
160extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
162extern void diff_tree_release_paths(struct diff_options *);
163extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
164 const char *base, struct diff_options *opt);
165extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
166 const char *base, struct diff_options *opt);
167extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
168 struct diff_options *opt);
169struct combine_diff_path {
171 struct combine_diff_path *next;
172 int len;
173 char *path;
174 unsigned int mode;
175 unsigned char sha1[20];
176 struct combine_diff_parent {
177 char status;
178 unsigned int mode;
179 unsigned char sha1[20];
180 } parent[FLEX_ARRAY];
181};
182#define combine_diff_path_size(n, l) \
183 (sizeof(struct combine_diff_path) + \
184 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
185extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
187 int dense, struct rev_info *);
188extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
190extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
192void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
194extern void diff_addremove(struct diff_options *,
196 int addremove,
197 unsigned mode,
198 const unsigned char *sha1,
199 const char *fullpath, unsigned dirty_submodule);
200extern void diff_change(struct diff_options *,
202 unsigned mode1, unsigned mode2,
203 const unsigned char *sha1,
204 const unsigned char *sha2,
205 const char *fullpath,
206 unsigned dirty_submodule1, unsigned dirty_submodule2);
207extern void diff_unmerge(struct diff_options *,
209 const char *path,
210 unsigned mode,
211 const unsigned char *sha1);
212#define DIFF_SETUP_REVERSE 1
214#define DIFF_SETUP_USE_CACHE 2
215#define DIFF_SETUP_USE_SIZE_CACHE 4
216extern int git_diff_basic_config(const char *var, const char *value, void *cb);
218extern int git_diff_ui_config(const char *var, const char *value, void *cb);
219extern int diff_use_color_default;
220extern void diff_setup(struct diff_options *);
221extern int diff_opt_parse(struct diff_options *, const char **, int);
222extern int diff_setup_done(struct diff_options *);
223#define DIFF_DETECT_RENAME 1
225#define DIFF_DETECT_COPY 2
226#define DIFF_PICKAXE_ALL 1
228#define DIFF_PICKAXE_REGEX 2
229extern void diffcore_std(struct diff_options *);
231extern void diffcore_fix_diff_index(struct diff_options *);
232#define COMMON_DIFF_OPTIONS_HELP \
234"\ncommon diff options:\n" \
235" -z output diff-raw with lines terminated with NUL.\n" \
236" -p output patch format.\n" \
237" -u synonym for -p.\n" \
238" --patch-with-raw\n" \
239" output both a patch and the diff-raw format.\n" \
240" --stat show diffstat instead of patch.\n" \
241" --numstat show numeric diffstat instead of patch.\n" \
242" --patch-with-stat\n" \
243" output a patch and prepend its diffstat.\n" \
244" --name-only show only names of changed files.\n" \
245" --name-status show names and status of changed files.\n" \
246" --full-index show full object name on index lines.\n" \
247" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
248" -R swap input file pairs.\n" \
249" -B detect complete rewrites.\n" \
250" -M detect renames.\n" \
251" -C detect copies.\n" \
252" --find-copies-harder\n" \
253" try unchanged files as candidate for copy detection.\n" \
254" -l<n> limit rename attempts up to <n> paths.\n" \
255" -O<file> reorder diffs according to the <file>.\n" \
256" -S<string> find filepair whose only one side contains the string.\n" \
257" --pickaxe-all\n" \
258" show all files diff when -S is used and hit is found.\n" \
259" -a --text treat all files as text.\n"
260extern int diff_queue_is_empty(void);
262extern void diff_flush(struct diff_options*);
263/* diff-raw status letters */
265#define DIFF_STATUS_ADDED 'A'
266#define DIFF_STATUS_COPIED 'C'
267#define DIFF_STATUS_DELETED 'D'
268#define DIFF_STATUS_MODIFIED 'M'
269#define DIFF_STATUS_RENAMED 'R'
270#define DIFF_STATUS_TYPE_CHANGED 'T'
271#define DIFF_STATUS_UNKNOWN 'X'
272#define DIFF_STATUS_UNMERGED 'U'
273/* these are not diff-raw status letters proper, but used by
275 * diffcore-filter insn to specify additional restrictions.
276 */
277#define DIFF_STATUS_FILTER_AON '*'
278#define DIFF_STATUS_FILTER_BROKEN 'B'
279extern const char *diff_unique_abbrev(const unsigned char *, int);
281/* do not report anything on removed paths */
283#define DIFF_SILENT_ON_REMOVED 01
284/* report racily-clean paths as modified */
285#define DIFF_RACY_IS_MODIFIED 02
286extern int run_diff_files(struct rev_info *revs, unsigned int option);
287extern int run_diff_index(struct rev_info *revs, int cached);
288extern int do_diff_cache(const unsigned char *, struct diff_options *);
290extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
291extern int diff_result_code(struct diff_options *, int);
293extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
295extern int index_differs_from(const char *def, int diff_flags);
297extern size_t fill_textconv(struct userdiff_driver *driver,
299 struct diff_filespec *df,
300 char **outbuf);
301extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
303#endif /* DIFF_H */