diff.h 8.4 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 17 18 19 20 21 22 23

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,
		 const char *base, const char *path);

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
		    const unsigned char *sha1,
		    const char *base, const char *path);

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

27 28
#define DIFF_FORMAT_RAW		0x0001
#define DIFF_FORMAT_DIFFSTAT	0x0002
J
Junio C Hamano 已提交
29 30 31
#define DIFF_FORMAT_NUMSTAT	0x0004
#define DIFF_FORMAT_SUMMARY	0x0008
#define DIFF_FORMAT_PATCH	0x0010
32
#define DIFF_FORMAT_SHORTSTAT	0x0020
33 34
#define DIFF_FORMAT_DIRSTAT	0x0040
#define DIFF_FORMAT_CUMULATIVE	0x0080
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 59 60 61 62 63
#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)
#define DIFF_OPT_QUIET               (1 << 11)
#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 67 68 69
#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)

J
Junio C Hamano 已提交
70 71 72 73
struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
74
	const char *single_follow;
75
	const char *a_prefix, *b_prefix;
76
	unsigned flags;
77
	int context;
J
Junio C Hamano 已提交
78 79
	int break_opt;
	int detect_rename;
J
Junio C Hamano 已提交
80
	int skip_stat_unmatch;
J
Junio C Hamano 已提交
81 82 83 84
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
85
	int rename_limit;
86
	int dirstat_percent;
J
Junio C Hamano 已提交
87
	int setup;
J
Junio C Hamano 已提交
88
	int abbrev;
89 90
	const char *prefix;
	int prefix_length;
T
Timo Hirvonen 已提交
91
	const char *msg_sep;
92
	const char *stat_sep;
93
	long xdl_opts;
94

95 96 97
	int stat_width;
	int stat_name_width;

98 99 100
	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

101 102 103
	int nr_paths;
	const char **paths;
	int *pathlens;
104 105
	change_fn_t change;
	add_remove_fn_t add_remove;
106 107
	diff_format_fn_t format_callback;
	void *format_callback_data;
J
Junio C Hamano 已提交
108 109
};

J
Jeff King 已提交
110 111 112 113 114 115 116 117
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,
118
	DIFF_WHITESPACE = 7,
J
Jeff King 已提交
119 120
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
121 122 123
#define diff_get_color_opt(o, ix) \
	diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)

J
Jeff King 已提交
124

125 126
extern const char mime_boundary_leader[];

127 128
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
129 130 131 132
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 已提交
133 134
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);
135

136 137 138 139
struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
140
	unsigned int mode;
141
	unsigned char sha1[20];
142
	struct combine_diff_parent {
143
		char status;
144 145 146
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
147
};
148 149 150
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
151

L
Linus Torvalds 已提交
152 153
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);
154

155 156
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 已提交
157
extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
158

J
Junio C Hamano 已提交
159 160
extern void diff_addremove(struct diff_options *,
			   int addremove,
161 162 163 164 165
			   unsigned mode,
			   const unsigned char *sha1,
			   const char *base,
			   const char *path);

J
Junio C Hamano 已提交
166 167 168 169 170
extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
			const char *base, const char *path);
171

J
Junio C Hamano 已提交
172
extern void diff_unmerge(struct diff_options *,
173 174 175
			 const char *path,
			 unsigned mode,
			 const unsigned char *sha1);
176

177
#define DIFF_SETUP_REVERSE      	1
178 179
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
180

J
Jeff King 已提交
181
extern int git_diff_basic_config(const char *var, const char *value);
182
extern int git_diff_ui_config(const char *var, const char *value);
183
extern int diff_use_color_default;
J
Junio C Hamano 已提交
184 185 186
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 *);
187

J
Junio C Hamano 已提交
188 189 190
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

191
#define DIFF_PICKAXE_ALL	1
192
#define DIFF_PICKAXE_REGEX	2
193

J
Junio C Hamano 已提交
194
extern void diffcore_std(struct diff_options *);
195

196 197
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
198 199 200
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
201 202
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
203
"  --stat        show diffstat instead of patch.\n" \
J
Junio C Hamano 已提交
204
"  --numstat     show numeric diffstat instead of patch.\n" \
205 206
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
207
"  --name-only   show only names of changed files.\n" \
208
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
209
"  --full-index  show full object name on index lines.\n" \
210
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
211 212 213 214
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
215
"  --find-copies-harder\n" \
216 217 218 219
"                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" \
220
"  --pickaxe-all\n" \
221 222
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"
223

224
extern int diff_queue_is_empty(void);
J
Junio C Hamano 已提交
225
extern void diff_flush(struct diff_options*);
226

227
/* diff-raw status letters */
228
#define DIFF_STATUS_ADDED		'A'
229 230 231 232 233 234 235 236 237 238 239
#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 已提交
240
#define DIFF_STATUS_FILTER_AON		'*'
241 242
#define DIFF_STATUS_FILTER_BROKEN	'B'

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

245 246
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
247 248
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
249
extern int run_diff_files(struct rev_info *revs, unsigned int option);
250 251
extern int setup_diff_no_index(struct rev_info *revs,
		int argc, const char ** argv, int nongit, const char *prefix);
252
extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
J
Junio C Hamano 已提交
253

254
extern int run_diff_index(struct rev_info *revs, int cached);
J
Junio C Hamano 已提交
255

256
extern int do_diff_cache(const unsigned char *, struct diff_options *);
257 258
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

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

261
#endif /* DIFF_H */