diff.h 10.3 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 16 17 18 19

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

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

28 29 30
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

31 32
typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);

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

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

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

J
Junio C Hamano 已提交
51
#define DIFF_FORMAT_CALLBACK	0x1000
52

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

82 83 84
#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)
85 86 87
#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)
88

89 90 91 92 93 94 95
enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

J
Junio C Hamano 已提交
96 97 98 99
struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
100
	const char *single_follow;
101
	const char *a_prefix, *b_prefix;
102
	unsigned flags;
103
	int context;
104
	int interhunkcontext;
J
Junio C Hamano 已提交
105 106
	int break_opt;
	int detect_rename;
J
Junio C Hamano 已提交
107
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
108 109 110 111
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
112
	int rename_limit;
113
	int warn_on_too_large_rename;
114
	int dirstat_percent;
J
Junio C Hamano 已提交
115
	int setup;
J
Junio C Hamano 已提交
116
	int abbrev;
117 118
	const char *prefix;
	int prefix_length;
119
	const char *stat_sep;
120
	long xdl_opts;
121

122 123
	int stat_width;
	int stat_name_width;
124
	const char *word_regex;
125
	enum diff_words_type word_diff;
126

127 128 129
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

130 131 132
	/* to support internal diff recursion by --follow hack*/
	int found_follow;

133 134 135
	FILE *file;
	int close_file;

136
	struct pathspec pathspec;
137 138
	change_fn_t change;
	add_remove_fn_t add_remove;
139 140
	diff_format_fn_t format_callback;
	void *format_callback_data;
141 142
	diff_prefix_fn_t output_prefix;
	void *output_prefix_data;
J
Junio C Hamano 已提交
143 144
};

J
Jeff King 已提交
145 146 147 148 149 150 151 152
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,
153
	DIFF_WHITESPACE = 7,
154
	DIFF_FUNCINFO = 8
J
Jeff King 已提交
155 156
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
157 158 159
#define diff_get_color_opt(o, ix) \
	diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)

J
Jeff King 已提交
160

161 162
extern const char mime_boundary_leader[];

163 164
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
165 166 167 168
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 已提交
169 170
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);
171

172 173 174 175
struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
176
	unsigned int mode;
177
	unsigned char sha1[20];
178
	struct combine_diff_parent {
179
		char status;
180 181 182
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
183
};
184 185 186
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
187

L
Linus Torvalds 已提交
188 189
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
190

191 192
extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);

L
Linus Torvalds 已提交
193
extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
194

195 196
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

J
Junio C Hamano 已提交
197 198
extern void diff_addremove(struct diff_options *,
			   int addremove,
199 200
			   unsigned mode,
			   const unsigned char *sha1,
201
			   const char *fullpath, unsigned dirty_submodule);
202

J
Junio C Hamano 已提交
203 204 205 206
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
207 208
			const char *fullpath,
			unsigned dirty_submodule1, unsigned dirty_submodule2);
209

J
Junio C Hamano 已提交
210
extern void diff_unmerge(struct diff_options *,
211 212 213
			 const char *path,
			 unsigned mode,
			 const unsigned char *sha1);
214

215
#define DIFF_SETUP_REVERSE      	1
216 217
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
218

219 220 221 222 223 224 225
/*
 * 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);

226 227
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);
228
extern int diff_use_color_default;
J
Junio C Hamano 已提交
229 230 231
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 *);
232

J
Junio C Hamano 已提交
233 234 235
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

236
#define DIFF_PICKAXE_ALL	1
237
#define DIFF_PICKAXE_REGEX	2
238

239 240 241
#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */

J
Junio C Hamano 已提交
242
extern void diffcore_std(struct diff_options *);
243
extern void diffcore_fix_diff_index(struct diff_options *);
244

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

273
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
274
extern void diff_flush(struct diff_options*);
275

276
/* diff-raw status letters */
277
#define DIFF_STATUS_ADDED		'A'
278 279 280 281 282 283 284 285 286 287 288
#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 已提交
289
#define DIFF_STATUS_FILTER_AON		'*'
290 291
#define DIFF_STATUS_FILTER_BROKEN	'B'

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

294 295
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
296 297
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
298
extern int run_diff_files(struct rev_info *revs, unsigned int option);
299
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
300

301
extern int do_diff_cache(const unsigned char *, struct diff_options *);
302 303
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

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

306 307
extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);

308 309
extern int index_differs_from(const char *def, int diff_flags);

A
Axel Bonnet 已提交
310 311 312 313 314 315
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);

316 317
extern int parse_rename_score(const char **cp_p);

318
#endif /* DIFF_H */