Merge branch 'np/types'
[git/git.git] / diff.h
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
6
7 #include "tree-walk.h"
8
9 struct rev_info;
10 struct diff_options;
11 struct diff_queue_struct;
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
24 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
27 #define DIFF_FORMAT_RAW 0x0001
28 #define DIFF_FORMAT_DIFFSTAT 0x0002
29 #define DIFF_FORMAT_NUMSTAT 0x0004
30 #define DIFF_FORMAT_SUMMARY 0x0008
31 #define DIFF_FORMAT_PATCH 0x0010
32 #define DIFF_FORMAT_SHORTSTAT 0x0020
33
34 /* These override all above */
35 #define DIFF_FORMAT_NAME 0x0100
36 #define DIFF_FORMAT_NAME_STATUS 0x0200
37 #define DIFF_FORMAT_CHECKDIFF 0x0400
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 */
42 #define DIFF_FORMAT_NO_OUTPUT 0x0800
43
44 #define DIFF_FORMAT_CALLBACK 0x1000
45
46 struct diff_options {
47 const char *filter;
48 const char *orderfile;
49 const char *pickaxe;
50 const char *single_follow;
51 unsigned recursive:1,
52 tree_in_recursive:1,
53 binary:1,
54 text:1,
55 full_index:1,
56 silent_on_remove:1,
57 find_copies_harder:1,
58 color_diff:1,
59 color_diff_words:1;
60 int context;
61 int break_opt;
62 int detect_rename;
63 int line_termination;
64 int output_format;
65 int pickaxe_opts;
66 int rename_score;
67 int reverse_diff;
68 int rename_limit;
69 int setup;
70 int abbrev;
71 const char *msg_sep;
72 const char *stat_sep;
73 long xdl_opts;
74
75 int stat_width;
76 int stat_name_width;
77
78 /* this is set by diffcore for DIFF_FORMAT_PATCH */
79 int found_changes;
80
81 int nr_paths;
82 const char **paths;
83 int *pathlens;
84 change_fn_t change;
85 add_remove_fn_t add_remove;
86 diff_format_fn_t format_callback;
87 void *format_callback_data;
88 };
89
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,
98 DIFF_WHITESPACE = 7,
99 };
100 const char *diff_get_color(int diff_use_color, enum color_diff ix);
101
102 extern const char mime_boundary_leader[];
103
104 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
105 extern void diff_tree_release_paths(struct diff_options *);
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);
110 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
111 struct diff_options *opt);
112
113 struct combine_diff_path {
114 struct combine_diff_path *next;
115 int len;
116 char *path;
117 unsigned int mode;
118 unsigned char sha1[20];
119 struct combine_diff_parent {
120 char status;
121 unsigned int mode;
122 unsigned char sha1[20];
123 } parent[FLEX_ARRAY];
124 };
125 #define combine_diff_path_size(n, l) \
126 (sizeof(struct combine_diff_path) + \
127 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
128
129 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
130 int dense, struct rev_info *);
131
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
134 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
135
136 extern void diff_addremove(struct diff_options *,
137 int addremove,
138 unsigned mode,
139 const unsigned char *sha1,
140 const char *base,
141 const char *path);
142
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);
148
149 extern void diff_unmerge(struct diff_options *,
150 const char *path,
151 unsigned mode,
152 const unsigned char *sha1);
153
154 extern int diff_scoreopt_parse(const char *opt);
155
156 #define DIFF_SETUP_REVERSE 1
157 #define DIFF_SETUP_USE_CACHE 2
158 #define DIFF_SETUP_USE_SIZE_CACHE 4
159
160 extern int git_diff_ui_config(const char *var, const char *value);
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 *);
164
165 #define DIFF_DETECT_RENAME 1
166 #define DIFF_DETECT_COPY 2
167
168 #define DIFF_PICKAXE_ALL 1
169 #define DIFF_PICKAXE_REGEX 2
170
171 extern void diffcore_std(struct diff_options *);
172
173 extern void diffcore_std_no_resolve(struct diff_options *);
174
175 #define COMMON_DIFF_OPTIONS_HELP \
176 "\ncommon diff options:\n" \
177 " -z output diff-raw with lines terminated with NUL.\n" \
178 " -p output patch format.\n" \
179 " -u synonym for -p.\n" \
180 " --patch-with-raw\n" \
181 " output both a patch and the diff-raw format.\n" \
182 " --stat show diffstat instead of patch.\n" \
183 " --numstat show numeric diffstat instead of patch.\n" \
184 " --patch-with-stat\n" \
185 " output a patch and prepend its diffstat.\n" \
186 " --name-only show only names of changed files.\n" \
187 " --name-status show names and status of changed files.\n" \
188 " --full-index show full object name on index lines.\n" \
189 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
190 " -R swap input file pairs.\n" \
191 " -B detect complete rewrites.\n" \
192 " -M detect renames.\n" \
193 " -C detect copies.\n" \
194 " --find-copies-harder\n" \
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" \
199 " --pickaxe-all\n" \
200 " show all files diff when -S is used and hit is found.\n" \
201 " -a --text treat all files as text.\n"
202
203 extern int diff_queue_is_empty(void);
204 extern void diff_flush(struct diff_options*);
205
206 /* diff-raw status letters */
207 #define DIFF_STATUS_ADDED 'A'
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 */
219 #define DIFF_STATUS_FILTER_AON '*'
220 #define DIFF_STATUS_FILTER_BROKEN 'B'
221
222 extern const char *diff_unique_abbrev(const unsigned char *, int);
223
224 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
225 extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
226
227 extern int run_diff_index(struct rev_info *revs, int cached);
228
229 extern int do_diff_cache(const unsigned char *, struct diff_options *);
230 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
231
232 #endif /* DIFF_H */