]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
86436c28 JH |
4 | #ifndef DIFF_H |
5 | #define DIFF_H | |
6 | ||
1b0c7174 | 7 | #include "tree-walk.h" |
50f9a858 | 8 | |
91539833 | 9 | struct rev_info; |
ac1b3d12 | 10 | struct diff_options; |
04245581 | 11 | struct diff_queue_struct; |
ac1b3d12 LT |
12 | |
13 | typedef void (*change_fn_t)(struct diff_options *options, | |
14 | unsigned old_mode, unsigned new_mode, | |
15 | const unsigned char *old_sha1, | |
16 | const unsigned char *new_sha1, | |
17 | const char *base, const char *path); | |
18 | ||
19 | typedef void (*add_remove_fn_t)(struct diff_options *options, | |
20 | int addremove, unsigned mode, | |
21 | const unsigned char *sha1, | |
22 | const char *base, const char *path); | |
23 | ||
04245581 JK |
24 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
25 | struct diff_options *options, void *data); | |
26 | ||
c6744349 TH |
27 | #define DIFF_FORMAT_RAW 0x0001 |
28 | #define DIFF_FORMAT_DIFFSTAT 0x0002 | |
74e2abe5 JH |
29 | #define DIFF_FORMAT_NUMSTAT 0x0004 |
30 | #define DIFF_FORMAT_SUMMARY 0x0008 | |
31 | #define DIFF_FORMAT_PATCH 0x0010 | |
c6744349 TH |
32 | |
33 | /* These override all above */ | |
74e2abe5 JH |
34 | #define DIFF_FORMAT_NAME 0x0100 |
35 | #define DIFF_FORMAT_NAME_STATUS 0x0200 | |
36 | #define DIFF_FORMAT_CHECKDIFF 0x0400 | |
c6744349 TH |
37 | |
38 | /* Same as output_format = 0 but we know that -s flag was given | |
39 | * and we should not give default value to output_format. | |
40 | */ | |
74e2abe5 | 41 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
c6744349 | 42 | |
74e2abe5 | 43 | #define DIFF_FORMAT_CALLBACK 0x1000 |
04245581 | 44 | |
6b5ee137 | 45 | struct diff_options { |
6b5ee137 JH |
46 | const char *filter; |
47 | const char *orderfile; | |
48 | const char *pickaxe; | |
ac1b3d12 | 49 | unsigned recursive:1, |
80b1e511 | 50 | tree_in_recursive:1, |
0660626c | 51 | binary:1, |
6d64ea96 | 52 | text:1, |
6973dcae JH |
53 | full_index:1, |
54 | silent_on_remove:1, | |
4bbd261b | 55 | find_copies_harder:1, |
f59a59e2 JS |
56 | color_diff:1, |
57 | color_diff_words:1; | |
ee1e5412 | 58 | int context; |
6b5ee137 JH |
59 | int break_opt; |
60 | int detect_rename; | |
6b5ee137 JH |
61 | int line_termination; |
62 | int output_format; | |
63 | int pickaxe_opts; | |
64 | int rename_score; | |
65 | int reverse_diff; | |
8082d8d3 | 66 | int rename_limit; |
6b5ee137 | 67 | int setup; |
47dd0d59 | 68 | int abbrev; |
39bc9a6c | 69 | const char *msg_sep; |
698ce6f8 | 70 | const char *stat_sep; |
0d21efa5 | 71 | long xdl_opts; |
ac1b3d12 | 72 | |
a2540023 JH |
73 | int stat_width; |
74 | int stat_name_width; | |
75 | ||
a8baa7b9 JH |
76 | int nr_paths; |
77 | const char **paths; | |
78 | int *pathlens; | |
ac1b3d12 LT |
79 | change_fn_t change; |
80 | add_remove_fn_t add_remove; | |
04245581 JK |
81 | diff_format_fn_t format_callback; |
82 | void *format_callback_data; | |
6b5ee137 JH |
83 | }; |
84 | ||
ce436973 JK |
85 | enum color_diff { |
86 | DIFF_RESET = 0, | |
87 | DIFF_PLAIN = 1, | |
88 | DIFF_METAINFO = 2, | |
89 | DIFF_FRAGINFO = 3, | |
90 | DIFF_FILE_OLD = 4, | |
91 | DIFF_FILE_NEW = 5, | |
92 | DIFF_COMMIT = 6, | |
448c3ef1 | 93 | DIFF_WHITESPACE = 7, |
ce436973 JK |
94 | }; |
95 | const char *diff_get_color(int diff_use_color, enum color_diff ix); | |
96 | ||
698ce6f8 JS |
97 | extern const char mime_boundary_leader[]; |
98 | ||
a8baa7b9 JH |
99 | extern void diff_tree_setup_paths(const char **paths, struct diff_options *); |
100 | extern void diff_tree_release_paths(struct diff_options *); | |
ac1b3d12 LT |
101 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |
102 | const char *base, struct diff_options *opt); | |
103 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, | |
104 | const char *base, struct diff_options *opt); | |
105 | ||
ea726d02 JH |
106 | struct combine_diff_path { |
107 | struct combine_diff_path *next; | |
108 | int len; | |
109 | char *path; | |
2454c962 | 110 | unsigned int mode; |
ea726d02 | 111 | unsigned char sha1[20]; |
2454c962 | 112 | struct combine_diff_parent { |
d416df88 | 113 | char status; |
2454c962 JH |
114 | unsigned int mode; |
115 | unsigned char sha1[20]; | |
116 | } parent[FLEX_ARRAY]; | |
ea726d02 | 117 | }; |
2454c962 JH |
118 | #define combine_diff_path_size(n, l) \ |
119 | (sizeof(struct combine_diff_path) + \ | |
120 | sizeof(struct combine_diff_parent) * (n) + (l) + 1) | |
ea726d02 | 121 | |
91539833 LT |
122 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
123 | int dense, struct rev_info *); | |
ea726d02 | 124 | |
0fe7c1de JH |
125 | extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev); |
126 | ||
91539833 | 127 | extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *); |
af3feefa | 128 | |
6b5ee137 JH |
129 | extern void diff_addremove(struct diff_options *, |
130 | int addremove, | |
77eb2720 JH |
131 | unsigned mode, |
132 | const unsigned char *sha1, | |
133 | const char *base, | |
134 | const char *path); | |
135 | ||
6b5ee137 JH |
136 | extern void diff_change(struct diff_options *, |
137 | unsigned mode1, unsigned mode2, | |
138 | const unsigned char *sha1, | |
139 | const unsigned char *sha2, | |
140 | const char *base, const char *path); | |
77eb2720 | 141 | |
6b5ee137 JH |
142 | extern void diff_unmerge(struct diff_options *, |
143 | const char *path); | |
77eb2720 | 144 | |
57fe64a4 JH |
145 | extern int diff_scoreopt_parse(const char *opt); |
146 | ||
19feebc8 | 147 | #define DIFF_SETUP_REVERSE 1 |
f0c6b2a2 JH |
148 | #define DIFF_SETUP_USE_CACHE 2 |
149 | #define DIFF_SETUP_USE_SIZE_CACHE 4 | |
ce240675 | 150 | |
83ad63cf | 151 | extern int git_diff_ui_config(const char *var, const char *value); |
6b5ee137 JH |
152 | extern void diff_setup(struct diff_options *); |
153 | extern int diff_opt_parse(struct diff_options *, const char **, int); | |
154 | extern int diff_setup_done(struct diff_options *); | |
86436c28 | 155 | |
6b14d7fa JH |
156 | #define DIFF_DETECT_RENAME 1 |
157 | #define DIFF_DETECT_COPY 2 | |
158 | ||
367cec1c | 159 | #define DIFF_PICKAXE_ALL 1 |
d01d8c67 | 160 | #define DIFF_PICKAXE_REGEX 2 |
f345b0a0 | 161 | |
6b5ee137 | 162 | extern void diffcore_std(struct diff_options *); |
f2ce9fde | 163 | |
6b5ee137 | 164 | extern void diffcore_std_no_resolve(struct diff_options *); |
befe8639 | 165 | |
dda2d79a JH |
166 | #define COMMON_DIFF_OPTIONS_HELP \ |
167 | "\ncommon diff options:\n" \ | |
8082d8d3 JH |
168 | " -z output diff-raw with lines terminated with NUL.\n" \ |
169 | " -p output patch format.\n" \ | |
170 | " -u synonym for -p.\n" \ | |
5c91da25 PB |
171 | " --patch-with-raw\n" \ |
172 | " output both a patch and the diff-raw format.\n" \ | |
d75f7952 | 173 | " --stat show diffstat instead of patch.\n" \ |
74e2abe5 | 174 | " --numstat show numeric diffstat instead of patch.\n" \ |
29353273 JS |
175 | " --patch-with-stat\n" \ |
176 | " output a patch and prepend its diffstat.\n" \ | |
8082d8d3 | 177 | " --name-only show only names of changed files.\n" \ |
946f5f7c | 178 | " --name-status show names and status of changed files.\n" \ |
47dd0d59 | 179 | " --full-index show full object name on index lines.\n" \ |
913419fc | 180 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
8082d8d3 JH |
181 | " -R swap input file pairs.\n" \ |
182 | " -B detect complete rewrites.\n" \ | |
183 | " -M detect renames.\n" \ | |
184 | " -C detect copies.\n" \ | |
dda2d79a | 185 | " --find-copies-harder\n" \ |
8082d8d3 JH |
186 | " try unchanged files as candidate for copy detection.\n" \ |
187 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
188 | " -O<file> reorder diffs according to the <file>.\n" \ | |
189 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
dda2d79a | 190 | " --pickaxe-all\n" \ |
ca49920f SF |
191 | " show all files diff when -S is used and hit is found.\n" \ |
192 | " -a --text treat all files as text.\n" | |
dda2d79a | 193 | |
38c6f780 | 194 | extern int diff_queue_is_empty(void); |
6b5ee137 | 195 | extern void diff_flush(struct diff_options*); |
86436c28 | 196 | |
e7baa4f4 | 197 | /* diff-raw status letters */ |
ca8c9156 | 198 | #define DIFF_STATUS_ADDED 'A' |
e7baa4f4 JH |
199 | #define DIFF_STATUS_COPIED 'C' |
200 | #define DIFF_STATUS_DELETED 'D' | |
201 | #define DIFF_STATUS_MODIFIED 'M' | |
202 | #define DIFF_STATUS_RENAMED 'R' | |
203 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
204 | #define DIFF_STATUS_UNKNOWN 'X' | |
205 | #define DIFF_STATUS_UNMERGED 'U' | |
206 | ||
207 | /* these are not diff-raw status letters proper, but used by | |
208 | * diffcore-filter insn to specify additional restrictions. | |
209 | */ | |
0b34379a | 210 | #define DIFF_STATUS_FILTER_AON '*' |
e7baa4f4 JH |
211 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
212 | ||
47dd0d59 JH |
213 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
214 | ||
6973dcae JH |
215 | extern int run_diff_files(struct rev_info *revs, int silent_on_removed); |
216 | ||
5c21ac0e | 217 | extern int run_diff_index(struct rev_info *revs, int cached); |
e09ad6e1 | 218 | |
fcb3d0ad JS |
219 | extern int diff_flush_patch_id(struct diff_options *, unsigned char *); |
220 | ||
86436c28 | 221 | #endif /* DIFF_H */ |