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