diff.h 13.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
#include "object.h"
10

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

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

typedef void (*change_fn_t)(struct diff_options *options,
		 unsigned old_mode, unsigned new_mode,
26 27 28
		 const struct object_id *old_oid,
		 const struct object_id *new_oid,
		 int old_oid_valid, int new_oid_valid,
29 30
		 const char *fullpath,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
31 32 33

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
34 35
		    const struct object_id *oid,
		    int oid_valid,
36
		    const char *fullpath, unsigned dirty_submodule);
37

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

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

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

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

/* 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 已提交
59
#define DIFF_FORMAT_NO_OUTPUT	0x0800
60

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

63 64
#define DIFF_FLAGS_INIT { 0 }
struct diff_flags {
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
	unsigned recursive:1;
	unsigned tree_in_recursive:1;
	unsigned binary:1;
	unsigned text:1;
	unsigned full_index:1;
	unsigned silent_on_remove:1;
	unsigned find_copies_harder:1;
	unsigned follow_renames:1;
	unsigned rename_empty:1;
	unsigned has_changes:1;
	unsigned quick:1;
	unsigned no_index:1;
	unsigned allow_external:1;
	unsigned exit_with_status:1;
	unsigned reverse_diff:1;
	unsigned check_failed:1;
	unsigned relative_name:1;
	unsigned ignore_submodules:1;
	unsigned dirstat_cumulative:1;
	unsigned dirstat_by_file:1;
	unsigned allow_textconv:1;
	unsigned textconv_set_via_cmdline:1;
	unsigned diff_from_contents:1;
	unsigned dirty_submodules:1;
	unsigned ignore_untracked_in_submodules:1;
	unsigned ignore_dirty_submodules:1;
	unsigned override_submodule_config:1;
	unsigned dirstat_by_line:1;
	unsigned funccontext:1;
	unsigned pickaxe_ignore_case:1;
	unsigned default_follow_renames:1;
96 97 98 99 100 101 102 103 104 105 106 107 108
};

static inline void diff_flags_or(struct diff_flags *a,
				 const struct diff_flags *b)
{
	char *tmp_a = (char *)a;
	const char *tmp_b = (const char *)b;
	int i;

	for (i = 0; i < sizeof(struct diff_flags); i++)
		tmp_a[i] |= tmp_b[i];
}

109 110 111
#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)
112

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

115 116 117 118 119 120 121
enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

122 123
enum diff_submodule_format {
	DIFF_SUBMODULE_SHORT = 0,
124 125
	DIFF_SUBMODULE_LOG,
	DIFF_SUBMODULE_INLINE_DIFF
126 127
};

J
Junio C Hamano 已提交
128 129 130
struct diff_options {
	const char *orderfile;
	const char *pickaxe;
131
	const char *single_follow;
132
	const char *a_prefix, *b_prefix;
133 134
	const char *line_prefix;
	size_t line_prefix_length;
135
	struct diff_flags flags;
136 137 138 139

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

140
	int use_color;
141
	int context;
142
	int interhunkcontext;
J
Junio C Hamano 已提交
143 144
	int break_opt;
	int detect_rename;
145
	int irreversible_delete;
J
Junio C Hamano 已提交
146
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
147 148 149 150
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
151
	int rename_limit;
152
	int needed_rename_limit;
153
	int degraded_cc_to_c;
154
	int show_rename_progress;
155
	int dirstat_permille;
J
Junio C Hamano 已提交
156
	int setup;
J
Junio C Hamano 已提交
157
	int abbrev;
158
	int ita_invisible_in_index;
159
/* white-space error highlighting */
160 161 162
#define WSEH_NEW (1<<12)
#define WSEH_CONTEXT (1<<13)
#define WSEH_OLD (1<<14)
163
	unsigned ws_error_highlight;
164 165
	const char *prefix;
	int prefix_length;
166
	const char *stat_sep;
167
	long xdl_opts;
168

169 170
	int stat_width;
	int stat_name_width;
171
	int stat_graph_width;
172
	int stat_count;
173
	const char *word_regex;
174
	enum diff_words_type word_diff;
175
	enum diff_submodule_format submodule_format;
176

177 178 179
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

180 181 182
	/* to support internal diff recursion by --follow hack*/
	int found_follow;

183 184
	void (*set_default)(struct diff_options *);

185 186 187
	FILE *file;
	int close_file;

188
	struct pathspec pathspec;
189
	pathchange_fn_t pathchange;
190 191
	change_fn_t change;
	add_remove_fn_t add_remove;
192
	void *change_fn_data;
193 194
	diff_format_fn_t format_callback;
	void *format_callback_data;
195 196
	diff_prefix_fn_t output_prefix;
	void *output_prefix_data;
197 198

	int diff_path_counter;
199 200

	struct emitted_diff_symbols *emitted_symbols;
201 202
	enum {
		COLOR_MOVED_NO = 0,
203
		COLOR_MOVED_PLAIN = 1,
204
		COLOR_MOVED_ZEBRA = 2,
205
		COLOR_MOVED_ZEBRA_DIM = 3,
206 207
	} color_moved;
	#define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
208
	#define COLOR_MOVED_MIN_ALNUM_COUNT 20
J
Junio C Hamano 已提交
209 210
};

211 212 213 214 215 216 217 218 219
void diff_emit_submodule_del(struct diff_options *o, const char *line);
void diff_emit_submodule_add(struct diff_options *o, const char *line);
void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
void diff_emit_submodule_modified(struct diff_options *o, const char *path);
void diff_emit_submodule_header(struct diff_options *o, const char *header);
void diff_emit_submodule_error(struct diff_options *o, const char *err);
void diff_emit_submodule_pipethrough(struct diff_options *o,
				     const char *line, int len);

J
Jeff King 已提交
220 221
enum color_diff {
	DIFF_RESET = 0,
222
	DIFF_CONTEXT = 1,
J
Jeff King 已提交
223 224 225 226 227
	DIFF_METAINFO = 2,
	DIFF_FRAGINFO = 3,
	DIFF_FILE_OLD = 4,
	DIFF_FILE_NEW = 5,
	DIFF_COMMIT = 6,
228
	DIFF_WHITESPACE = 7,
229 230 231
	DIFF_FUNCINFO = 8,
	DIFF_FILE_OLD_MOVED = 9,
	DIFF_FILE_OLD_MOVED_ALT = 10,
232 233 234 235 236 237
	DIFF_FILE_OLD_MOVED_DIM = 11,
	DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
	DIFF_FILE_NEW_MOVED = 13,
	DIFF_FILE_NEW_MOVED_ALT = 14,
	DIFF_FILE_NEW_MOVED_DIM = 15,
	DIFF_FILE_NEW_MOVED_ALT_DIM = 16
J
Jeff King 已提交
238 239
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
240
#define diff_get_color_opt(o, ix) \
241
	diff_get_color((o)->use_color, ix)
242

J
Jeff King 已提交
243

244 245 246
const char *diff_line_prefix(struct diff_options *);


247 248
extern const char mime_boundary_leader[];

249
extern struct combine_diff_path *diff_tree_paths(
250 251
	struct combine_diff_path *p, const struct object_id *oid,
	const struct object_id **parents_oid, int nparent,
252
	struct strbuf *base, struct diff_options *opt);
253 254 255
extern int diff_tree_oid(const struct object_id *old_oid,
			 const struct object_id *new_oid,
			 const char *base, struct diff_options *opt);
256 257
extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
			      struct diff_options *opt);
258

259 260 261
struct combine_diff_path {
	struct combine_diff_path *next;
	char *path;
262
	unsigned int mode;
263
	struct object_id oid;
264
	struct combine_diff_parent {
265
		char status;
266
		unsigned int mode;
267
		struct object_id oid;
268
	} parent[FLEX_ARRAY];
269
};
270
#define combine_diff_path_size(n, l) \
271 272
	st_add4(sizeof(struct combine_diff_path), (l), 1, \
		st_mult(sizeof(struct combine_diff_parent), (n)))
273

L
Linus Torvalds 已提交
274 275
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
276

277
extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
278

279
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
280

281 282
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

283 284
extern int diff_can_quit_early(struct diff_options *);

J
Junio C Hamano 已提交
285 286
extern void diff_addremove(struct diff_options *,
			   int addremove,
287
			   unsigned mode,
288 289
			   const struct object_id *oid,
			   int oid_valid,
290
			   const char *fullpath, unsigned dirty_submodule);
291

J
Junio C Hamano 已提交
292 293
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
294 295 296
			const struct object_id *old_oid,
			const struct object_id *new_oid,
			int old_oid_valid, int new_oid_valid,
297 298
			const char *fullpath,
			unsigned dirty_submodule1, unsigned dirty_submodule2);
299

300
extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
301

302
#define DIFF_SETUP_REVERSE      	1
303 304
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
305

306
/*
307
 * Poor man's alternative to parse-option, to allow both stuck form
308 309 310 311 312
 * (--option=value) and separate form (--option value).
 */
extern int parse_long_opt(const char *opt, const char **argv,
			 const char **optarg);

313
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
314
extern int git_diff_heuristic_config(const char *var, const char *value, void *cb);
315
extern void init_diff_ui_defaults(void);
316
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
J
Junio C Hamano 已提交
317
extern void diff_setup(struct diff_options *);
318
extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
T
Thomas Rast 已提交
319
extern void diff_setup_done(struct diff_options *);
320

J
Junio C Hamano 已提交
321 322 323
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

324
#define DIFF_PICKAXE_ALL	1
325
#define DIFF_PICKAXE_REGEX	2
326

327 328 329
#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */

J
Junio C Hamano 已提交
330
extern void diffcore_std(struct diff_options *);
331
extern void diffcore_fix_diff_index(struct diff_options *);
332

333 334
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
335 336 337
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
338 339
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
340
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
341
"  --numstat     show numeric diffstat instead of patch.\n" \
342 343
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
344
"  --name-only   show only names of changed files.\n" \
345
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
346
"  --full-index  show full object name on index lines.\n" \
347
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
348 349 350 351
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
352
"  --find-copies-harder\n" \
353 354 355 356
"                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" \
357
"  --pickaxe-all\n" \
358 359
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
360

361
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
362
extern void diff_flush(struct diff_options*);
363
extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
364

365
/* diff-raw status letters */
366
#define DIFF_STATUS_ADDED		'A'
367 368 369 370 371 372 373 374 375 376 377
#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 已提交
378
#define DIFF_STATUS_FILTER_AON		'*'
379 380
#define DIFF_STATUS_FILTER_BROKEN	'B'

381 382 383 384
/*
 * This is different from find_unique_abbrev() in that
 * it stuffs the result with dots for alignment.
 */
J
Jeff King 已提交
385
extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);
J
Junio C Hamano 已提交
386

387 388
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
389 390
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
391
extern int run_diff_files(struct rev_info *revs, unsigned int option);
392
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
393

394
extern int do_diff_cache(const struct object_id *, struct diff_options *);
395
extern int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
396

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

399
extern void diff_no_index(struct rev_info *, int, const char **);
400

401 402
extern int index_differs_from(const char *def, const struct diff_flags *flags,
			      int ita_invisible_in_index);
403

J
Jeff King 已提交
404 405 406 407 408 409 410 411 412 413 414
/*
 * Fill the contents of the filespec "df", respecting any textconv defined by
 * its userdiff driver.  The "driver" parameter must come from a
 * previous call to get_textconv(), and therefore should either be NULL or have
 * textconv enabled.
 *
 * Note that the memory ownership of the resulting buffer depends on whether
 * the driver field is NULL. If it is, then the memory belongs to the filespec
 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
 * that should be freed by the caller.
 */
A
Axel Bonnet 已提交
415 416 417 418
extern size_t fill_textconv(struct userdiff_driver *driver,
			    struct diff_filespec *df,
			    char **outbuf);

J
Jeff King 已提交
419 420 421 422 423
/*
 * Look up the userdiff driver for the given filespec, and return it if
 * and only if it has textconv enabled (otherwise return NULL). The result
 * can be passed to fill_textconv().
 */
A
Axel Bonnet 已提交
424 425
extern struct userdiff_driver *get_textconv(struct diff_filespec *one);

426 427 428 429 430 431 432
/*
 * Prepare diff_filespec and convert it using diff textconv API
 * if the textconv driver exists.
 * Return 1 if the conversion succeeds, 0 otherwise.
 */
extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);

433 434
extern int parse_rename_score(const char **cp_p);

435 436
extern long parse_algorithm_value(const char *value);

437 438
extern void print_stat_summary(FILE *fp, int files,
			       int insertions, int deletions);
439
extern void setup_diff_pager(struct diff_options *);
440

441
#endif /* DIFF_H */