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