diff.h 9.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 13 14 15 16

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,
17 18
		 const char *fullpath,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
19 20 21 22

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

25 26 27
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

28 29
#define DIFF_FORMAT_RAW		0x0001
#define DIFF_FORMAT_DIFFSTAT	0x0002
J
Junio C Hamano 已提交
30 31 32
#define DIFF_FORMAT_NUMSTAT	0x0004
#define DIFF_FORMAT_SUMMARY	0x0008
#define DIFF_FORMAT_PATCH	0x0010
33
#define DIFF_FORMAT_SHORTSTAT	0x0020
34
#define DIFF_FORMAT_DIRSTAT	0x0040
35 36

/* These override all above */
J
Junio C Hamano 已提交
37 38 39
#define DIFF_FORMAT_NAME	0x0100
#define DIFF_FORMAT_NAME_STATUS	0x0200
#define DIFF_FORMAT_CHECKDIFF	0x0400
40 41 42 43

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

J
Junio C Hamano 已提交
46
#define DIFF_FORMAT_CALLBACK	0x1000
47

48 49 50 51 52 53 54 55 56 57 58
#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)
#define DIFF_OPT_COLOR_DIFF_WORDS    (1 <<  9)
#define DIFF_OPT_HAS_CHANGES         (1 << 10)
59
#define DIFF_OPT_QUICK               (1 << 11)
60 61 62 63
#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)
64
#define DIFF_OPT_CHECK_FAILED        (1 << 16)
65
#define DIFF_OPT_RELATIVE_NAME       (1 << 17)
66
#define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
67
#define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
68
#define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
69
#define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
70
#define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
71
#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
72
#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
73
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
74

75 76 77
#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)
78 79 80
#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)
81

J
Junio C Hamano 已提交
82 83 84 85
struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
86
	const char *single_follow;
87
	const char *a_prefix, *b_prefix;
88
	unsigned flags;
89
	int context;
90
	int interhunkcontext;
J
Junio C Hamano 已提交
91 92
	int break_opt;
	int detect_rename;
J
Junio C Hamano 已提交
93
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
94 95 96 97
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
98
	int rename_limit;
99
	int warn_on_too_large_rename;
100
	int dirstat_percent;
J
Junio C Hamano 已提交
101
	int setup;
J
Junio C Hamano 已提交
102
	int abbrev;
103 104
	const char *prefix;
	int prefix_length;
105
	const char *stat_sep;
106
	long xdl_opts;
107

108 109
	int stat_width;
	int stat_name_width;
110
	const char *word_regex;
111

112 113 114
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

115 116 117
	FILE *file;
	int close_file;

118 119 120
	int nr_paths;
	const char **paths;
	int *pathlens;
121 122
	change_fn_t change;
	add_remove_fn_t add_remove;
123 124
	diff_format_fn_t format_callback;
	void *format_callback_data;
J
Junio C Hamano 已提交
125 126
};

J
Jeff King 已提交
127 128 129 130 131 132 133 134
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,
135
	DIFF_WHITESPACE = 7,
B
Bert Wesarg 已提交
136
	DIFF_FUNCINFO = 8,
J
Jeff King 已提交
137 138
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
139 140 141
#define diff_get_color_opt(o, ix) \
	diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)

J
Jeff King 已提交
142

143 144
extern const char mime_boundary_leader[];

145 146
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
147 148 149 150
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 已提交
151 152
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);
153

154 155 156 157
struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
158
	unsigned int mode;
159
	unsigned char sha1[20];
160
	struct combine_diff_parent {
161
		char status;
162 163 164
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
165
};
166 167 168
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
169

L
Linus Torvalds 已提交
170 171
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
172

173 174
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 已提交
175
extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
176

177 178
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

J
Junio C Hamano 已提交
179 180
extern void diff_addremove(struct diff_options *,
			   int addremove,
181 182
			   unsigned mode,
			   const unsigned char *sha1,
183
			   const char *fullpath, unsigned dirty_submodule);
184

J
Junio C Hamano 已提交
185 186 187 188
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
189 190
			const char *fullpath,
			unsigned dirty_submodule1, unsigned dirty_submodule2);
191

J
Junio C Hamano 已提交
192
extern void diff_unmerge(struct diff_options *,
193 194 195
			 const char *path,
			 unsigned mode,
			 const unsigned char *sha1);
196

197
#define DIFF_SETUP_REVERSE      	1
198 199
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
200

201 202
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);
203
extern int diff_use_color_default;
J
Junio C Hamano 已提交
204 205 206
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 *);
207

J
Junio C Hamano 已提交
208 209 210
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

211
#define DIFF_PICKAXE_ALL	1
212
#define DIFF_PICKAXE_REGEX	2
213

J
Junio C Hamano 已提交
214
extern void diffcore_std(struct diff_options *);
215
extern void diffcore_fix_diff_index(struct diff_options *);
216

217 218
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
219 220 221
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
222 223
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
224
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
225
"  --numstat     show numeric diffstat instead of patch.\n" \
226 227
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
228
"  --name-only   show only names of changed files.\n" \
229
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
230
"  --full-index  show full object name on index lines.\n" \
231
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
232 233 234 235
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
236
"  --find-copies-harder\n" \
237 238 239 240
"                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" \
241
"  --pickaxe-all\n" \
242 243
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
244

245
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
246
extern void diff_flush(struct diff_options*);
247

248
/* diff-raw status letters */
249
#define DIFF_STATUS_ADDED		'A'
250 251 252 253 254 255 256 257 258 259 260
#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 已提交
261
#define DIFF_STATUS_FILTER_AON		'*'
262 263
#define DIFF_STATUS_FILTER_BROKEN	'B'

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

266 267
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
268 269
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
270
extern int run_diff_files(struct rev_info *revs, unsigned int option);
271
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
272

273
extern int do_diff_cache(const unsigned char *, struct diff_options *);
274 275
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

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

278 279
extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);

280 281
extern int index_differs_from(const char *def, int diff_flags);

282
#endif /* DIFF_H */