diff.h 11.6 KB
Newer Older
1 2 3
/*
 * Copyright (C) 2005 Junio C Hamano
 */
4 5 6
#ifndef DIFF_H
#define DIFF_H

J
Junio C Hamano 已提交
7
#include "tree-walk.h"
8
#include "pathspec.h"
9

L
Linus Torvalds 已提交
10
struct rev_info;
11
struct diff_options;
12
struct diff_queue_struct;
13
struct strbuf;
A
Axel Bonnet 已提交
14 15
struct diff_filespec;
struct userdiff_driver;
16
struct sha1_array;
17
struct commit;
18 19 20 21
struct combine_diff_path;

typedef int (*pathchange_fn_t)(struct diff_options *options,
		 struct combine_diff_path *path);
22 23 24 25 26

typedef void (*change_fn_t)(struct diff_options *options,
		 unsigned old_mode, unsigned new_mode,
		 const unsigned char *old_sha1,
		 const unsigned char *new_sha1,
27
		 int old_sha1_valid, int new_sha1_valid,
28 29
		 const char *fullpath,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
30 31 32 33

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
		    const unsigned char *sha1,
34
		    int sha1_valid,
35
		    const char *fullpath, unsigned dirty_submodule);
36

37 38 39
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

40 41
typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);

42 43
#define DIFF_FORMAT_RAW		0x0001
#define DIFF_FORMAT_DIFFSTAT	0x0002
J
Junio C Hamano 已提交
44 45 46
#define DIFF_FORMAT_NUMSTAT	0x0004
#define DIFF_FORMAT_SUMMARY	0x0008
#define DIFF_FORMAT_PATCH	0x0010
47
#define DIFF_FORMAT_SHORTSTAT	0x0020
48
#define DIFF_FORMAT_DIRSTAT	0x0040
49 50

/* These override all above */
J
Junio C Hamano 已提交
51 52 53
#define DIFF_FORMAT_NAME	0x0100
#define DIFF_FORMAT_NAME_STATUS	0x0200
#define DIFF_FORMAT_CHECKDIFF	0x0400
54 55 56 57

/* Same as output_format = 0 but we know that -s flag was given
 * and we should not give default value to output_format.
 */
J
Junio C Hamano 已提交
58
#define DIFF_FORMAT_NO_OUTPUT	0x0800
59

J
Junio C Hamano 已提交
60
#define DIFF_FORMAT_CALLBACK	0x1000
61

62 63 64 65 66 67 68 69
#define DIFF_OPT_RECURSIVE           (1 <<  0)
#define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
#define DIFF_OPT_BINARY              (1 <<  2)
#define DIFF_OPT_TEXT                (1 <<  3)
#define DIFF_OPT_FULL_INDEX          (1 <<  4)
#define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
#define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
#define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
70
#define DIFF_OPT_RENAME_EMPTY        (1 <<  8)
71
/* (1 <<  9) unused */
72
#define DIFF_OPT_HAS_CHANGES         (1 << 10)
73
#define DIFF_OPT_QUICK               (1 << 11)
74 75 76 77
#define DIFF_OPT_NO_INDEX            (1 << 12)
#define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
#define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
#define DIFF_OPT_REVERSE_DIFF        (1 << 15)
78
#define DIFF_OPT_CHECK_FAILED        (1 << 16)
79
#define DIFF_OPT_RELATIVE_NAME       (1 << 17)
80
#define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
81
#define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
82
#define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
83
#define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
84
#define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
85
#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
86
#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
87
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
88
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
89
#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
90
#define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
91
#define DIFF_OPT_FUNCCONTEXT         (1 << 29)
92
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
93

94
#define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
95 96 97
#define DIFF_OPT_TOUCHED(opts, flag)    ((opts)->touched_flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag)    (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
#define DIFF_OPT_CLR(opts, flag)    (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
98 99 100
#define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
#define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
#define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)
101

102 103
#define DIFF_WITH_ALG(opts, flag)   (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)

104 105 106 107 108 109 110
enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

J
Junio C Hamano 已提交
111 112 113
struct diff_options {
	const char *orderfile;
	const char *pickaxe;
114
	const char *single_follow;
115
	const char *a_prefix, *b_prefix;
116
	unsigned flags;
117
	unsigned touched_flags;
118 119 120 121

	/* diff-filter bits */
	unsigned int filter;

122
	int use_color;
123
	int context;
124
	int interhunkcontext;
J
Junio C Hamano 已提交
125 126
	int break_opt;
	int detect_rename;
127
	int irreversible_delete;
J
Junio C Hamano 已提交
128
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
129 130 131 132
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
133
	int rename_limit;
134
	int needed_rename_limit;
135
	int degraded_cc_to_c;
136
	int show_rename_progress;
137
	int dirstat_permille;
J
Junio C Hamano 已提交
138
	int setup;
J
Junio C Hamano 已提交
139
	int abbrev;
140 141
	const char *prefix;
	int prefix_length;
142
	const char *stat_sep;
143
	long xdl_opts;
144

145 146
	int stat_width;
	int stat_name_width;
147
	int stat_graph_width;
148
	int stat_count;
149
	const char *word_regex;
150
	enum diff_words_type word_diff;
151

152 153 154
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

155 156 157
	/* to support internal diff recursion by --follow hack*/
	int found_follow;

158 159
	void (*set_default)(struct diff_options *);

160 161 162
	FILE *file;
	int close_file;

163
	struct pathspec pathspec;
164
	pathchange_fn_t pathchange;
165 166
	change_fn_t change;
	add_remove_fn_t add_remove;
167 168
	diff_format_fn_t format_callback;
	void *format_callback_data;
169
	diff_prefix_fn_t output_prefix;
170
	int output_prefix_length;
171
	void *output_prefix_data;
172 173

	int diff_path_counter;
J
Junio C Hamano 已提交
174 175
};

J
Jeff King 已提交
176 177 178 179 180 181 182 183
enum color_diff {
	DIFF_RESET = 0,
	DIFF_PLAIN = 1,
	DIFF_METAINFO = 2,
	DIFF_FRAGINFO = 3,
	DIFF_FILE_OLD = 4,
	DIFF_FILE_NEW = 5,
	DIFF_COMMIT = 6,
184
	DIFF_WHITESPACE = 7,
185
	DIFF_FUNCINFO = 8
J
Jeff King 已提交
186 187
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
188
#define diff_get_color_opt(o, ix) \
189
	diff_get_color((o)->use_color, ix)
190

J
Jeff King 已提交
191

192 193 194
const char *diff_line_prefix(struct diff_options *);


195 196
extern const char mime_boundary_leader[];

197 198 199 200
extern struct combine_diff_path *diff_tree_paths(
	struct combine_diff_path *p, const unsigned char *sha1,
	const unsigned char **parent_sha1, int nparent,
	struct strbuf *base, struct diff_options *opt);
201 202
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
			  const char *base, struct diff_options *opt);
R
Rene Scharfe 已提交
203 204
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);
205

206 207 208
struct combine_diff_path {
	struct combine_diff_path *next;
	char *path;
209
	unsigned int mode;
210
	unsigned char sha1[20];
211
	struct combine_diff_parent {
212
		char status;
213 214 215
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
216
};
217 218 219
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
220

L
Linus Torvalds 已提交
221 222
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
223

224
extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
225

226
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
227

228 229
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

230 231
extern int diff_can_quit_early(struct diff_options *);

J
Junio C Hamano 已提交
232 233
extern void diff_addremove(struct diff_options *,
			   int addremove,
234 235
			   unsigned mode,
			   const unsigned char *sha1,
236
			   int sha1_valid,
237
			   const char *fullpath, unsigned dirty_submodule);
238

J
Junio C Hamano 已提交
239 240 241 242
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
243 244
			int sha1_valid,
			int sha2_valid,
245 246
			const char *fullpath,
			unsigned dirty_submodule1, unsigned dirty_submodule2);
247

248
extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
249

250
#define DIFF_SETUP_REVERSE      	1
251 252
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
253

254
/*
255
 * Poor man's alternative to parse-option, to allow both stuck form
256 257 258 259 260
 * (--option=value) and separate form (--option value).
 */
extern int parse_long_opt(const char *opt, const char **argv,
			 const char **optarg);

261 262
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
J
Junio C Hamano 已提交
263 264
extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int);
T
Thomas Rast 已提交
265
extern void diff_setup_done(struct diff_options *);
266

J
Junio C Hamano 已提交
267 268 269
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

270
#define DIFF_PICKAXE_ALL	1
271
#define DIFF_PICKAXE_REGEX	2
272

273 274 275
#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */

J
Junio C Hamano 已提交
276
extern void diffcore_std(struct diff_options *);
277
extern void diffcore_fix_diff_index(struct diff_options *);
278

279 280
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
281 282 283
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
284 285
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
286
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
287
"  --numstat     show numeric diffstat instead of patch.\n" \
288 289
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
290
"  --name-only   show only names of changed files.\n" \
291
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
292
"  --full-index  show full object name on index lines.\n" \
293
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
294 295 296 297
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
298
"  --find-copies-harder\n" \
299 300 301 302
"                try unchanged files as candidate for copy detection.\n" \
"  -l<n>         limit rename attempts up to <n> paths.\n" \
"  -O<file>      reorder diffs according to the <file>.\n" \
"  -S<string>    find filepair whose only one side contains the string.\n" \
303
"  --pickaxe-all\n" \
304 305
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
306

307
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
308
extern void diff_flush(struct diff_options*);
309
extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
310

311
/* diff-raw status letters */
312
#define DIFF_STATUS_ADDED		'A'
313 314 315 316 317 318 319 320 321 322 323
#define DIFF_STATUS_COPIED		'C'
#define DIFF_STATUS_DELETED		'D'
#define DIFF_STATUS_MODIFIED		'M'
#define DIFF_STATUS_RENAMED		'R'
#define DIFF_STATUS_TYPE_CHANGED	'T'
#define DIFF_STATUS_UNKNOWN		'X'
#define DIFF_STATUS_UNMERGED		'U'

/* these are not diff-raw status letters proper, but used by
 * diffcore-filter insn to specify additional restrictions.
 */
J
Junio C Hamano 已提交
324
#define DIFF_STATUS_FILTER_AON		'*'
325 326
#define DIFF_STATUS_FILTER_BROKEN	'B'

J
Junio C Hamano 已提交
327 328
extern const char *diff_unique_abbrev(const unsigned char *, int);

329 330
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
331 332
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
333
extern int run_diff_files(struct rev_info *revs, unsigned int option);
334
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
335

336
extern int do_diff_cache(const unsigned char *, struct diff_options *);
337 338
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

J
Junio C Hamano 已提交
339 340
extern int diff_result_code(struct diff_options *, int);

341
extern void diff_no_index(struct rev_info *, int, const char **, const char *);
342

343 344
extern int index_differs_from(const char *def, int diff_flags);

A
Axel Bonnet 已提交
345 346 347 348 349 350
extern size_t fill_textconv(struct userdiff_driver *driver,
			    struct diff_filespec *df,
			    char **outbuf);

extern struct userdiff_driver *get_textconv(struct diff_filespec *one);

351 352
extern int parse_rename_score(const char **cp_p);

353 354
extern long parse_algorithm_value(const char *value);

355 356
extern void handle_deprecated_show_diff_q(struct diff_options *);

357 358
extern int print_stat_summary(FILE *fp, int files,
			      int insertions, int deletions);
359
extern void setup_diff_pager(struct diff_options *);
360

361
#endif /* DIFF_H */