diff.h 4.0 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 8 9 10
#define DIFF_FILE_CANON_MODE(mode) \
	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)

11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
struct tree_desc {
	void *buf;
	unsigned long size;
};

struct diff_options;

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);

J
Junio C Hamano 已提交
29 30 31 32 33
struct diff_options {
	const char **paths;
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
34
	unsigned recursive:1,
J
Junio C Hamano 已提交
35 36
		 tree_in_recursive:1,
		 full_index:1;
J
Junio C Hamano 已提交
37 38 39 40 41 42 43 44
	int break_opt;
	int detect_rename;
	int find_copies_harder;
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
	int reverse_diff;
45
	int rename_limit;
J
Junio C Hamano 已提交
46
	int setup;
47 48 49

	change_fn_t change;
	add_remove_fn_t add_remove;
J
Junio C Hamano 已提交
50 51
};

52 53 54 55 56 57
extern void diff_tree_setup_paths(const char **paths);
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);

J
Junio C Hamano 已提交
58 59
extern void diff_addremove(struct diff_options *,
			   int addremove,
60 61 62 63 64
			   unsigned mode,
			   const unsigned char *sha1,
			   const char *base,
			   const char *path);

J
Junio C Hamano 已提交
65 66 67 68 69
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);
70

J
Junio C Hamano 已提交
71 72
extern void diff_unmerge(struct diff_options *,
			 const char *path);
73

J
Junio C Hamano 已提交
74 75
extern int diff_scoreopt_parse(const char *opt);

76
#define DIFF_SETUP_REVERSE      	1
77 78
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
79

J
Junio C Hamano 已提交
80 81 82
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 *);
83

J
Junio C Hamano 已提交
84 85 86
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

87
#define DIFF_PICKAXE_ALL	1
88

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

J
Junio C Hamano 已提交
91
extern void diffcore_std_no_resolve(struct diff_options *);
92

93 94
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
95 96 97 98
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
"  --name-only   show only names of changed files.\n" \
99
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
100
"  --full-index  show full object name on index ines.\n" \
101 102 103 104
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
105
"  --find-copies-harder\n" \
106 107 108 109
"                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" \
110
"  --pickaxe-all\n" \
111
"                show all files diff when -S is used and hit is found.\n"
112

113 114
extern int diff_queue_is_empty(void);

115
#define DIFF_FORMAT_RAW		1
116 117
#define DIFF_FORMAT_PATCH	2
#define DIFF_FORMAT_NO_OUTPUT	3
118
#define DIFF_FORMAT_NAME	4
119
#define DIFF_FORMAT_NAME_STATUS	5
120

J
Junio C Hamano 已提交
121
extern void diff_flush(struct diff_options*);
122

123
/* diff-raw status letters */
124
#define DIFF_STATUS_ADDED		'A'
125 126 127 128 129 130 131 132 133 134 135
#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 已提交
136
#define DIFF_STATUS_FILTER_AON		'*'
137 138
#define DIFF_STATUS_FILTER_BROKEN	'B'

139
#endif /* DIFF_H */