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