Merge branch 'jn/gitweb-grep'
[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 *base, const char *path);
18
19 typedef void (*add_remove_fn_t)(struct diff_options *options,
20 int addremove, unsigned mode,
21 const unsigned char *sha1,
22 const char *base, const char *path);
23
24 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
27 #define DIFF_FORMAT_RAW 0x0001
28 #define DIFF_FORMAT_DIFFSTAT 0x0002
29 #define DIFF_FORMAT_NUMSTAT 0x0004
30 #define DIFF_FORMAT_SUMMARY 0x0008
31 #define DIFF_FORMAT_PATCH 0x0010
32 #define DIFF_FORMAT_SHORTSTAT 0x0020
33 #define DIFF_FORMAT_DIRSTAT 0x0040
34 #define DIFF_FORMAT_CUMULATIVE 0x0080
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_QUIET (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_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
67 #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
68 #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
69
70 struct diff_options {
71 const char *filter;
72 const char *orderfile;
73 const char *pickaxe;
74 const char *single_follow;
75 const char *a_prefix, *b_prefix;
76 unsigned flags;
77 int context;
78 int break_opt;
79 int detect_rename;
80 int skip_stat_unmatch;
81 int line_termination;
82 int output_format;
83 int pickaxe_opts;
84 int rename_score;
85 int rename_limit;
86 int dirstat_percent;
87 int setup;
88 int abbrev;
89 const char *prefix;
90 int prefix_length;
91 const char *msg_sep;
92 const char *stat_sep;
93 long xdl_opts;
94
95 int stat_width;
96 int stat_name_width;
97
98 /* this is set by diffcore for DIFF_FORMAT_PATCH */
99 int found_changes;
100
101 int nr_paths;
102 const char **paths;
103 int *pathlens;
104 change_fn_t change;
105 add_remove_fn_t add_remove;
106 diff_format_fn_t format_callback;
107 void *format_callback_data;
108 };
109
110 enum color_diff {
111 DIFF_RESET = 0,
112 DIFF_PLAIN = 1,
113 DIFF_METAINFO = 2,
114 DIFF_FRAGINFO = 3,
115 DIFF_FILE_OLD = 4,
116 DIFF_FILE_NEW = 5,
117 DIFF_COMMIT = 6,
118 DIFF_WHITESPACE = 7,
119 };
120 const char *diff_get_color(int diff_use_color, enum color_diff ix);
121 #define diff_get_color_opt(o, ix) \
122 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
123
124
125 extern const char mime_boundary_leader[];
126
127 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
128 extern void diff_tree_release_paths(struct diff_options *);
129 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
130 const char *base, struct diff_options *opt);
131 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
132 const char *base, struct diff_options *opt);
133 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
134 struct diff_options *opt);
135
136 struct combine_diff_path {
137 struct combine_diff_path *next;
138 int len;
139 char *path;
140 unsigned int mode;
141 unsigned char sha1[20];
142 struct combine_diff_parent {
143 char status;
144 unsigned int mode;
145 unsigned char sha1[20];
146 } parent[FLEX_ARRAY];
147 };
148 #define combine_diff_path_size(n, l) \
149 (sizeof(struct combine_diff_path) + \
150 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
151
152 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
153 int dense, struct rev_info *);
154
155 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
156
157 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
158
159 extern void diff_addremove(struct diff_options *,
160 int addremove,
161 unsigned mode,
162 const unsigned char *sha1,
163 const char *base,
164 const char *path);
165
166 extern void diff_change(struct diff_options *,
167 unsigned mode1, unsigned mode2,
168 const unsigned char *sha1,
169 const unsigned char *sha2,
170 const char *base, const char *path);
171
172 extern void diff_unmerge(struct diff_options *,
173 const char *path,
174 unsigned mode,
175 const unsigned char *sha1);
176
177 #define DIFF_SETUP_REVERSE 1
178 #define DIFF_SETUP_USE_CACHE 2
179 #define DIFF_SETUP_USE_SIZE_CACHE 4
180
181 extern int git_diff_basic_config(const char *var, const char *value);
182 extern int git_diff_ui_config(const char *var, const char *value);
183 extern int diff_use_color_default;
184 extern void diff_setup(struct diff_options *);
185 extern int diff_opt_parse(struct diff_options *, const char **, int);
186 extern int diff_setup_done(struct diff_options *);
187
188 #define DIFF_DETECT_RENAME 1
189 #define DIFF_DETECT_COPY 2
190
191 #define DIFF_PICKAXE_ALL 1
192 #define DIFF_PICKAXE_REGEX 2
193
194 extern void diffcore_std(struct diff_options *);
195
196 #define COMMON_DIFF_OPTIONS_HELP \
197 "\ncommon diff options:\n" \
198 " -z output diff-raw with lines terminated with NUL.\n" \
199 " -p output patch format.\n" \
200 " -u synonym for -p.\n" \
201 " --patch-with-raw\n" \
202 " output both a patch and the diff-raw format.\n" \
203 " --stat show diffstat instead of patch.\n" \
204 " --numstat show numeric diffstat instead of patch.\n" \
205 " --patch-with-stat\n" \
206 " output a patch and prepend its diffstat.\n" \
207 " --name-only show only names of changed files.\n" \
208 " --name-status show names and status of changed files.\n" \
209 " --full-index show full object name on index lines.\n" \
210 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
211 " -R swap input file pairs.\n" \
212 " -B detect complete rewrites.\n" \
213 " -M detect renames.\n" \
214 " -C detect copies.\n" \
215 " --find-copies-harder\n" \
216 " try unchanged files as candidate for copy detection.\n" \
217 " -l<n> limit rename attempts up to <n> paths.\n" \
218 " -O<file> reorder diffs according to the <file>.\n" \
219 " -S<string> find filepair whose only one side contains the string.\n" \
220 " --pickaxe-all\n" \
221 " show all files diff when -S is used and hit is found.\n" \
222 " -a --text treat all files as text.\n"
223
224 extern int diff_queue_is_empty(void);
225 extern void diff_flush(struct diff_options*);
226
227 /* diff-raw status letters */
228 #define DIFF_STATUS_ADDED 'A'
229 #define DIFF_STATUS_COPIED 'C'
230 #define DIFF_STATUS_DELETED 'D'
231 #define DIFF_STATUS_MODIFIED 'M'
232 #define DIFF_STATUS_RENAMED 'R'
233 #define DIFF_STATUS_TYPE_CHANGED 'T'
234 #define DIFF_STATUS_UNKNOWN 'X'
235 #define DIFF_STATUS_UNMERGED 'U'
236
237 /* these are not diff-raw status letters proper, but used by
238 * diffcore-filter insn to specify additional restrictions.
239 */
240 #define DIFF_STATUS_FILTER_AON '*'
241 #define DIFF_STATUS_FILTER_BROKEN 'B'
242
243 extern const char *diff_unique_abbrev(const unsigned char *, int);
244
245 /* do not report anything on removed paths */
246 #define DIFF_SILENT_ON_REMOVED 01
247 /* report racily-clean paths as modified */
248 #define DIFF_RACY_IS_MODIFIED 02
249 extern int run_diff_files(struct rev_info *revs, unsigned int option);
250 extern int setup_diff_no_index(struct rev_info *revs,
251 int argc, const char ** argv, int nongit, const char *prefix);
252 extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
253
254 extern int run_diff_index(struct rev_info *revs, int cached);
255
256 extern int do_diff_cache(const unsigned char *, struct diff_options *);
257 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
258
259 extern int diff_result_code(struct diff_options *, int);
260
261 #endif /* DIFF_H */