diff.h 10.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

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

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,
22 23
		 const char *fullpath,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
24 25 26 27

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
		    const unsigned char *sha1,
28
		    const char *fullpath, unsigned dirty_submodule);
29

30 31 32
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

33 34
typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);

35 36
#define DIFF_FORMAT_RAW		0x0001
#define DIFF_FORMAT_DIFFSTAT	0x0002
J
Junio C Hamano 已提交
37 38 39
#define DIFF_FORMAT_NUMSTAT	0x0004
#define DIFF_FORMAT_SUMMARY	0x0008
#define DIFF_FORMAT_PATCH	0x0010
40
#define DIFF_FORMAT_SHORTSTAT	0x0020
41
#define DIFF_FORMAT_DIRSTAT	0x0040
42 43

/* These override all above */
J
Junio C Hamano 已提交
44 45 46
#define DIFF_FORMAT_NAME	0x0100
#define DIFF_FORMAT_NAME_STATUS	0x0200
#define DIFF_FORMAT_CHECKDIFF	0x0400
47 48 49 50

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

J
Junio C Hamano 已提交
53
#define DIFF_FORMAT_CALLBACK	0x1000
54

55 56 57 58 59 60 61 62
#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)
63
/* (1 <<  8) unused */
64
/* (1 <<  9) unused */
65
#define DIFF_OPT_HAS_CHANGES         (1 << 10)
66
#define DIFF_OPT_QUICK               (1 << 11)
67 68 69 70
#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)
71
#define DIFF_OPT_CHECK_FAILED        (1 << 16)
72
#define DIFF_OPT_RELATIVE_NAME       (1 << 17)
73
#define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
74
#define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
75
#define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
76
#define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
77
#define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
78
#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
79
#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
80
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
81
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
82
#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
83
#define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
84
#define DIFF_OPT_FUNCCONTEXT         (1 << 29)
85

86 87 88
#define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
#define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)
89 90 91
#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)
92

93 94 95 96 97 98 99
enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

J
Junio C Hamano 已提交
100 101 102 103
struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
104
	const char *single_follow;
105
	const char *a_prefix, *b_prefix;
106
	unsigned flags;
107
	int use_color;
108
	int context;
109
	int interhunkcontext;
J
Junio C Hamano 已提交
110 111
	int break_opt;
	int detect_rename;
112
	int irreversible_delete;
J
Junio C Hamano 已提交
113
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
114 115 116 117
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
118
	int rename_limit;
119
	int needed_rename_limit;
120
	int degraded_cc_to_c;
121
	int show_rename_progress;
122
	int dirstat_permille;
J
Junio C Hamano 已提交
123
	int setup;
J
Junio C Hamano 已提交
124
	int abbrev;
125 126
	const char *prefix;
	int prefix_length;
127
	const char *stat_sep;
128
	long xdl_opts;
129

130 131
	int stat_width;
	int stat_name_width;
132
	int stat_count;
133
	const char *word_regex;
134
	enum diff_words_type word_diff;
135

136 137 138
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

139 140 141
	/* to support internal diff recursion by --follow hack*/
	int found_follow;

142 143 144
	FILE *file;
	int close_file;

145
	struct pathspec pathspec;
146 147
	change_fn_t change;
	add_remove_fn_t add_remove;
148 149
	diff_format_fn_t format_callback;
	void *format_callback_data;
150 151
	diff_prefix_fn_t output_prefix;
	void *output_prefix_data;
J
Junio C Hamano 已提交
152 153
};

J
Jeff King 已提交
154 155 156 157 158 159 160 161
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,
162
	DIFF_WHITESPACE = 7,
163
	DIFF_FUNCINFO = 8
J
Jeff King 已提交
164 165
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
166
#define diff_get_color_opt(o, ix) \
167
	diff_get_color((o)->use_color, ix)
168

J
Jeff King 已提交
169

170 171
extern const char mime_boundary_leader[];

172 173
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
174 175 176 177
extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
		     const char *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
			  const char *base, struct diff_options *opt);
R
Rene Scharfe 已提交
178 179
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);
180

181 182 183 184
struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
185
	unsigned int mode;
186
	unsigned char sha1[20];
187
	struct combine_diff_parent {
188
		char status;
189 190 191
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
192
};
193 194 195
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
196

L
Linus Torvalds 已提交
197 198
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
199

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

202
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
203

204 205
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

206 207
extern int diff_can_quit_early(struct diff_options *);

J
Junio C Hamano 已提交
208 209
extern void diff_addremove(struct diff_options *,
			   int addremove,
210 211
			   unsigned mode,
			   const unsigned char *sha1,
212
			   const char *fullpath, unsigned dirty_submodule);
213

J
Junio C Hamano 已提交
214 215 216 217
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
218 219
			const char *fullpath,
			unsigned dirty_submodule1, unsigned dirty_submodule2);
220

221
extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
222

223
#define DIFF_SETUP_REVERSE      	1
224 225
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
226

227 228 229 230 231 232 233
/*
 * Poor man's alternative to parse-option, to allow both sticked form
 * (--option=value) and separate form (--option value).
 */
extern int parse_long_opt(const char *opt, const char **argv,
			 const char **optarg);

234 235
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);
236
extern int diff_use_color_default;
J
Junio C Hamano 已提交
237 238 239
extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int);
extern int diff_setup_done(struct diff_options *);
240

J
Junio C Hamano 已提交
241 242 243
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

244
#define DIFF_PICKAXE_ALL	1
245
#define DIFF_PICKAXE_REGEX	2
246

247 248 249
#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */

J
Junio C Hamano 已提交
250
extern void diffcore_std(struct diff_options *);
251
extern void diffcore_fix_diff_index(struct diff_options *);
252

253 254
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
255 256 257
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
258 259
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
260
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
261
"  --numstat     show numeric diffstat instead of patch.\n" \
262 263
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
264
"  --name-only   show only names of changed files.\n" \
265
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
266
"  --full-index  show full object name on index lines.\n" \
267
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
268 269 270 271
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
272
"  --find-copies-harder\n" \
273 274 275 276
"                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" \
277
"  --pickaxe-all\n" \
278 279
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
280

281
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
282
extern void diff_flush(struct diff_options*);
283
extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
284

285
/* diff-raw status letters */
286
#define DIFF_STATUS_ADDED		'A'
287 288 289 290 291 292 293 294 295 296 297
#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 已提交
298
#define DIFF_STATUS_FILTER_AON		'*'
299 300
#define DIFF_STATUS_FILTER_BROKEN	'B'

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

303 304
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
305 306
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
307
extern int run_diff_files(struct rev_info *revs, unsigned int option);
308
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
309

310
extern int do_diff_cache(const unsigned char *, struct diff_options *);
311 312
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

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

315 316
extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);

317 318
extern int index_differs_from(const char *def, int diff_flags);

A
Axel Bonnet 已提交
319 320 321 322 323 324
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);

325 326
extern int parse_rename_score(const char **cp_p);

327
#endif /* DIFF_H */