diff.h 14.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
#include "oidset.h"
11

12 13 14
struct combine_diff_path;
struct commit;
struct diff_filespec;
15
struct diff_options;
16
struct diff_queue_struct;
17
struct oid_array;
18
struct option;
19
struct repository;
20 21 22
struct rev_info;
struct strbuf;
struct userdiff_driver;
23 24 25

typedef int (*pathchange_fn_t)(struct diff_options *options,
		 struct combine_diff_path *path);
26 27 28

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

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
37 38
		    const struct object_id *oid,
		    int oid_valid,
39
		    const char *fullpath, unsigned dirty_submodule);
40

41 42 43
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

44 45
typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);

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

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

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

J
Junio C Hamano 已提交
64
#define DIFF_FORMAT_CALLBACK	0x1000
65

66 67
#define DIFF_FLAGS_INIT { 0 }
struct diff_flags {
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 96 97 98 99 100
	unsigned recursive;
	unsigned tree_in_recursive;
	unsigned binary;
	unsigned text;
	unsigned full_index;
	unsigned silent_on_remove;
	unsigned find_copies_harder;
	unsigned follow_renames;
	unsigned rename_empty;
	unsigned has_changes;
	unsigned quick;
	unsigned no_index;
	unsigned allow_external;
	unsigned exit_with_status;
	unsigned reverse_diff;
	unsigned check_failed;
	unsigned relative_name;
	unsigned ignore_submodules;
	unsigned dirstat_cumulative;
	unsigned dirstat_by_file;
	unsigned allow_textconv;
	unsigned textconv_set_via_cmdline;
	unsigned diff_from_contents;
	unsigned dirty_submodules;
	unsigned ignore_untracked_in_submodules;
	unsigned ignore_dirty_submodules;
	unsigned override_submodule_config;
	unsigned dirstat_by_line;
	unsigned funccontext;
	unsigned default_follow_renames;
	unsigned stat_with_summary;
	unsigned suppress_diff_headers;
	unsigned dual_color_diffed_diffs;
101 102 103 104 105 106 107 108 109 110 111 112 113
};

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];
}

114 115 116
#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)
117

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

120 121 122 123 124 125 126
enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

127 128
enum diff_submodule_format {
	DIFF_SUBMODULE_SHORT = 0,
129 130
	DIFF_SUBMODULE_LOG,
	DIFF_SUBMODULE_INLINE_DIFF
131 132
};

J
Junio C Hamano 已提交
133 134 135
struct diff_options {
	const char *orderfile;
	const char *pickaxe;
136
	const char *single_follow;
137
	const char *a_prefix, *b_prefix;
138 139
	const char *line_prefix;
	size_t line_prefix_length;
140
	struct diff_flags flags;
141 142 143 144

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

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

J
Jonathan Tan 已提交
174 175 176 177
	/* see Documentation/diff-options.txt */
	char **anchors;
	size_t anchors_nr, anchors_alloc;

178 179
	int stat_width;
	int stat_name_width;
180
	int stat_graph_width;
181
	int stat_count;
182
	const char *word_regex;
183
	enum diff_words_type word_diff;
184
	enum diff_submodule_format submodule_format;
185

186 187
	struct oidset *objfind;

188 189 190
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

191 192 193
	/* to support internal diff recursion by --follow hack*/
	int found_follow;

194 195
	void (*set_default)(struct diff_options *);

196 197 198
	FILE *file;
	int close_file;

199 200 201 202 203
#define OUTPUT_INDICATOR_NEW 0
#define OUTPUT_INDICATOR_OLD 1
#define OUTPUT_INDICATOR_CONTEXT 2
	char output_indicators[3];

204
	struct pathspec pathspec;
205
	pathchange_fn_t pathchange;
206 207
	change_fn_t change;
	add_remove_fn_t add_remove;
208
	void *change_fn_data;
209 210
	diff_format_fn_t format_callback;
	void *format_callback_data;
211 212
	diff_prefix_fn_t output_prefix;
	void *output_prefix_data;
213 214

	int diff_path_counter;
215 216

	struct emitted_diff_symbols *emitted_symbols;
217 218
	enum {
		COLOR_MOVED_NO = 0,
219
		COLOR_MOVED_PLAIN = 1,
220 221 222
		COLOR_MOVED_BLOCKS = 2,
		COLOR_MOVED_ZEBRA = 3,
		COLOR_MOVED_ZEBRA_DIM = 4,
223 224
	} color_moved;
	#define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
225
	#define COLOR_MOVED_MIN_ALNUM_COUNT 20
226 227 228

	/* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
	#define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
229 230
	#define COLOR_MOVED_WS_ERROR (1<<0)
	unsigned color_moved_ws_handling;
231 232

	struct repository *repo;
233
	struct option *parseopts;
J
Junio C Hamano 已提交
234 235
};

236 237 238 239 240 241 242 243 244
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 已提交
245 246
enum color_diff {
	DIFF_RESET = 0,
247
	DIFF_CONTEXT = 1,
J
Jeff King 已提交
248 249 250 251 252
	DIFF_METAINFO = 2,
	DIFF_FRAGINFO = 3,
	DIFF_FILE_OLD = 4,
	DIFF_FILE_NEW = 5,
	DIFF_COMMIT = 6,
253
	DIFF_WHITESPACE = 7,
254 255 256
	DIFF_FUNCINFO = 8,
	DIFF_FILE_OLD_MOVED = 9,
	DIFF_FILE_OLD_MOVED_ALT = 10,
257 258 259 260 261
	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,
262 263 264 265 266 267 268
	DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
	DIFF_CONTEXT_DIM = 17,
	DIFF_FILE_OLD_DIM = 18,
	DIFF_FILE_NEW_DIM = 19,
	DIFF_CONTEXT_BOLD = 20,
	DIFF_FILE_OLD_BOLD = 21,
	DIFF_FILE_NEW_BOLD = 22,
J
Jeff King 已提交
269 270
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
271
#define diff_get_color_opt(o, ix) \
272
	diff_get_color((o)->use_color, ix)
273

J
Jeff King 已提交
274

275 276 277
const char *diff_line_prefix(struct diff_options *);


278 279
extern const char mime_boundary_leader[];

280
struct combine_diff_path *diff_tree_paths(
281 282
	struct combine_diff_path *p, const struct object_id *oid,
	const struct object_id **parents_oid, int nparent,
283
	struct strbuf *base, struct diff_options *opt);
284 285 286 287 288
int diff_tree_oid(const struct object_id *old_oid,
		  const struct object_id *new_oid,
		  const char *base, struct diff_options *opt);
int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
		       struct diff_options *opt);
289

290 291 292
struct combine_diff_path {
	struct combine_diff_path *next;
	char *path;
293
	unsigned int mode;
294
	struct object_id oid;
295
	struct combine_diff_parent {
296
		char status;
297
		unsigned int mode;
298
		struct object_id oid;
299
	} parent[FLEX_ARRAY];
300
};
301
#define combine_diff_path_size(n, l) \
302 303
	st_add4(sizeof(struct combine_diff_path), (l), 1, \
		st_mult(sizeof(struct combine_diff_parent), (n)))
304

305 306
void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			int dense, struct rev_info *);
307

308
void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
309

310
void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
311

312 313
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

314
int diff_can_quit_early(struct diff_options *);
315

316 317 318 319 320 321
void diff_addremove(struct diff_options *,
		    int addremove,
		    unsigned mode,
		    const struct object_id *oid,
		    int oid_valid,
		    const char *fullpath, unsigned dirty_submodule);
322

323 324 325 326 327 328 329
void diff_change(struct diff_options *,
		 unsigned mode1, unsigned mode2,
		 const struct object_id *old_oid,
		 const struct object_id *new_oid,
		 int old_oid_valid, int new_oid_valid,
		 const char *fullpath,
		 unsigned dirty_submodule1, unsigned dirty_submodule2);
330

331
struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
332

333
#define DIFF_SETUP_REVERSE      	1
334
#define DIFF_SETUP_USE_SIZE_CACHE	4
335

336
/*
337
 * Poor man's alternative to parse-option, to allow both stuck form
338 339
 * (--option=value) and separate form (--option value).
 */
340 341 342 343 344 345 346
int parse_long_opt(const char *opt, const char **argv,
		   const char **optarg);

int git_diff_basic_config(const char *var, const char *value, void *cb);
int git_diff_heuristic_config(const char *var, const char *value, void *cb);
void init_diff_ui_defaults(void);
int git_diff_ui_config(const char *var, const char *value, void *cb);
347 348 349 350
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
#endif
void repo_diff_setup(struct repository *, struct diff_options *);
351 352 353
int diff_opt_parse(struct diff_options *, const char **, int, const char *);
void diff_setup_done(struct diff_options *);
int git_config_rename(const char *var, const char *value);
354

J
Junio C Hamano 已提交
355 356 357
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

358
#define DIFF_PICKAXE_ALL	1
359
#define DIFF_PICKAXE_REGEX	2
360

361 362
#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */
363
#define DIFF_PICKAXE_KIND_OBJFIND	16 /* specific object IDs */
364

365 366 367
#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
				 DIFF_PICKAXE_KIND_G | \
				 DIFF_PICKAXE_KIND_OBJFIND)
368

369
#define DIFF_PICKAXE_IGNORE_CASE	32
370

371 372
void diffcore_std(struct diff_options *);
void diffcore_fix_diff_index(struct diff_options *);
373

374 375
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
376 377 378
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
379 380
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
381
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
382
"  --numstat     show numeric diffstat instead of patch.\n" \
383 384
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
385
"  --name-only   show only names of changed files.\n" \
386
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
387
"  --full-index  show full object name on index lines.\n" \
388
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
389 390 391 392
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
393
"  --find-copies-harder\n" \
394 395 396 397
"                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" \
398
"  --pickaxe-all\n" \
399 400
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
401

402 403 404
int diff_queue_is_empty(void);
void diff_flush(struct diff_options*);
void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
405

406
/* diff-raw status letters */
407
#define DIFF_STATUS_ADDED		'A'
408 409 410 411 412 413 414 415 416 417 418
#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 已提交
419
#define DIFF_STATUS_FILTER_AON		'*'
420 421
#define DIFF_STATUS_FILTER_BROKEN	'B'

422 423 424 425
/*
 * This is different from find_unique_abbrev() in that
 * it stuffs the result with dots for alignment.
 */
426
const char *diff_aligned_abbrev(const struct object_id *sha1, int);
J
Junio C Hamano 已提交
427

428 429
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
430 431
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
432 433
int run_diff_files(struct rev_info *revs, unsigned int option);
int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
434

435 436
int do_diff_cache(const struct object_id *, struct diff_options *);
int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
437

438
int diff_result_code(struct diff_options *, int);
J
Junio C Hamano 已提交
439

440
void diff_no_index(struct repository *, struct rev_info *, int, const char **);
441

442 443
int index_differs_from(struct repository *r, const char *def,
		       const struct diff_flags *flags,
444
		       int ita_invisible_in_index);
445

J
Jeff King 已提交
446 447 448 449 450 451 452 453 454 455 456
/*
 * 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.
 */
457 458
size_t fill_textconv(struct repository *r,
		     struct userdiff_driver *driver,
459 460
		     struct diff_filespec *df,
		     char **outbuf);
A
Axel Bonnet 已提交
461

J
Jeff King 已提交
462 463 464 465 466
/*
 * 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().
 */
467
struct userdiff_driver *get_textconv(struct repository *r,
468
				     struct diff_filespec *one);
A
Axel Bonnet 已提交
469

470 471 472 473 474
/*
 * Prepare diff_filespec and convert it using diff textconv API
 * if the textconv driver exists.
 * Return 1 if the conversion succeeds, 0 otherwise.
 */
475 476 477 478 479
int textconv_object(struct repository *repo,
		    const char *path,
		    unsigned mode,
		    const struct object_id *oid, int oid_valid,
		    char **buf, unsigned long *buf_size);
480

481
int parse_rename_score(const char **cp_p);
482

483
long parse_algorithm_value(const char *value);
484

485 486 487
void print_stat_summary(FILE *fp, int files,
			int insertions, int deletions);
void setup_diff_pager(struct diff_options *);
488

489
#endif /* DIFF_H */