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

9 10 11 12 13 14 15 16 17 18 19 20 21
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 已提交
22 23 24 25
struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
26
	unsigned recursive:1,
J
Junio C Hamano 已提交
27
		 with_raw:1,
J
Junio C Hamano 已提交
28 29
		 tree_in_recursive:1,
		 full_index:1;
J
Junio C Hamano 已提交
30 31 32 33 34 35 36 37
	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;
38
	int rename_limit;
J
Junio C Hamano 已提交
39
	int setup;
J
Junio C Hamano 已提交
40
	int abbrev;
41

42 43 44
	int nr_paths;
	const char **paths;
	int *pathlens;
45 46
	change_fn_t change;
	add_remove_fn_t add_remove;
J
Junio C Hamano 已提交
47 48
};

49 50
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
51 52 53 54 55
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);

56 57 58 59
struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
60
	unsigned int mode;
61
	unsigned char sha1[20];
62
	struct combine_diff_parent {
63
		char status;
64 65 66
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
67
};
68 69 70
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
71

L
Linus Torvalds 已提交
72
extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
73 74
			      int dense, const char *header,
			      struct diff_options *);
75

L
Linus Torvalds 已提交
76
extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
77

J
Junio C Hamano 已提交
78 79
extern void diff_addremove(struct diff_options *,
			   int addremove,
80 81 82 83 84
			   unsigned mode,
			   const unsigned char *sha1,
			   const char *base,
			   const char *path);

J
Junio C Hamano 已提交
85 86 87 88 89
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);
90

J
Junio C Hamano 已提交
91 92
extern void diff_unmerge(struct diff_options *,
			 const char *path);
93

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

96
#define DIFF_SETUP_REVERSE      	1
97 98
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
99

100
extern int git_diff_config(const char *var, const char *value);
J
Junio C Hamano 已提交
101 102 103
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 *);
104

J
Junio C Hamano 已提交
105 106 107
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

108
#define DIFF_PICKAXE_ALL	1
109
#define DIFF_PICKAXE_REGEX	2
110

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

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

115 116
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
117 118 119
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
P
Petr Baudis 已提交
120 121
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
122
"  --name-only   show only names of changed files.\n" \
123
"  --name-status show names and status of changed files.\n" \
J
Junio C Hamano 已提交
124
"  --full-index  show full object name on index lines.\n" \
125
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
126 127 128 129
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
130
"  --find-copies-harder\n" \
131 132 133 134
"                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" \
135
"  --pickaxe-all\n" \
136
"                show all files diff when -S is used and hit is found.\n"
137

138 139
extern int diff_queue_is_empty(void);

140
#define DIFF_FORMAT_RAW		1
141 142
#define DIFF_FORMAT_PATCH	2
#define DIFF_FORMAT_NO_OUTPUT	3
143
#define DIFF_FORMAT_NAME	4
144
#define DIFF_FORMAT_NAME_STATUS	5
145

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

148
/* diff-raw status letters */
149
#define DIFF_STATUS_ADDED		'A'
150 151 152 153 154 155 156 157 158 159 160
#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 已提交
161
#define DIFF_STATUS_FILTER_AON		'*'
162 163
#define DIFF_STATUS_FILTER_BROKEN	'B'

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

166
#endif /* DIFF_H */