Make git-cherry handle root trees
[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
33 /* These override all above */
34 #define DIFF_FORMAT_NAME 0x0100
35 #define DIFF_FORMAT_NAME_STATUS 0x0200
36 #define DIFF_FORMAT_CHECKDIFF 0x0400
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 */
41 #define DIFF_FORMAT_NO_OUTPUT 0x0800
42
43 #define DIFF_FORMAT_CALLBACK 0x1000
44
45 struct diff_options {
46 const char *filter;
47 const char *orderfile;
48 const char *pickaxe;
49 unsigned recursive:1,
50 tree_in_recursive:1,
51 binary:1,
52 text:1,
53 full_index:1,
54 silent_on_remove:1,
55 find_copies_harder:1,
56 color_diff:1,
57 color_diff_words:1;
58 int context;
59 int break_opt;
60 int detect_rename;
61 int line_termination;
62 int output_format;
63 int pickaxe_opts;
64 int rename_score;
65 int reverse_diff;
66 int rename_limit;
67 int setup;
68 int abbrev;
69 const char *msg_sep;
70 const char *stat_sep;
71 long xdl_opts;
72
73 int stat_width;
74 int stat_name_width;
75
76 int nr_paths;
77 const char **paths;
78 int *pathlens;
79 change_fn_t change;
80 add_remove_fn_t add_remove;
81 diff_format_fn_t format_callback;
82 void *format_callback_data;
83 };
84
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,
93 DIFF_WHITESPACE = 7,
94 };
95 const char *diff_get_color(int diff_use_color, enum color_diff ix);
96
97 extern const char mime_boundary_leader[];
98
99 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
100 extern void diff_tree_release_paths(struct diff_options *);
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 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
106 struct diff_options *opt);
107
108 struct combine_diff_path {
109 struct combine_diff_path *next;
110 int len;
111 char *path;
112 unsigned int mode;
113 unsigned char sha1[20];
114 struct combine_diff_parent {
115 char status;
116 unsigned int mode;
117 unsigned char sha1[20];
118 } parent[FLEX_ARRAY];
119 };
120 #define combine_diff_path_size(n, l) \
121 (sizeof(struct combine_diff_path) + \
122 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
123
124 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
125 int dense, struct rev_info *);
126
127 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
128
129 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
130
131 extern void diff_addremove(struct diff_options *,
132 int addremove,
133 unsigned mode,
134 const unsigned char *sha1,
135 const char *base,
136 const char *path);
137
138 extern void diff_change(struct diff_options *,
139 unsigned mode1, unsigned mode2,
140 const unsigned char *sha1,
141 const unsigned char *sha2,
142 const char *base, const char *path);
143
144 extern void diff_unmerge(struct diff_options *,
145 const char *path);
146
147 extern int diff_scoreopt_parse(const char *opt);
148
149 #define DIFF_SETUP_REVERSE 1
150 #define DIFF_SETUP_USE_CACHE 2
151 #define DIFF_SETUP_USE_SIZE_CACHE 4
152
153 extern int git_diff_ui_config(const char *var, const char *value);
154 extern void diff_setup(struct diff_options *);
155 extern int diff_opt_parse(struct diff_options *, const char **, int);
156 extern int diff_setup_done(struct diff_options *);
157
158 #define DIFF_DETECT_RENAME 1
159 #define DIFF_DETECT_COPY 2
160
161 #define DIFF_PICKAXE_ALL 1
162 #define DIFF_PICKAXE_REGEX 2
163
164 extern void diffcore_std(struct diff_options *);
165
166 extern void diffcore_std_no_resolve(struct diff_options *);
167
168 #define COMMON_DIFF_OPTIONS_HELP \
169 "\ncommon diff options:\n" \
170 " -z output diff-raw with lines terminated with NUL.\n" \
171 " -p output patch format.\n" \
172 " -u synonym for -p.\n" \
173 " --patch-with-raw\n" \
174 " output both a patch and the diff-raw format.\n" \
175 " --stat show diffstat instead of patch.\n" \
176 " --numstat show numeric diffstat instead of patch.\n" \
177 " --patch-with-stat\n" \
178 " output a patch and prepend its diffstat.\n" \
179 " --name-only show only names of changed files.\n" \
180 " --name-status show names and status of changed files.\n" \
181 " --full-index show full object name on index lines.\n" \
182 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
183 " -R swap input file pairs.\n" \
184 " -B detect complete rewrites.\n" \
185 " -M detect renames.\n" \
186 " -C detect copies.\n" \
187 " --find-copies-harder\n" \
188 " try unchanged files as candidate for copy detection.\n" \
189 " -l<n> limit rename attempts up to <n> paths.\n" \
190 " -O<file> reorder diffs according to the <file>.\n" \
191 " -S<string> find filepair whose only one side contains the string.\n" \
192 " --pickaxe-all\n" \
193 " show all files diff when -S is used and hit is found.\n" \
194 " -a --text treat all files as text.\n"
195
196 extern int diff_queue_is_empty(void);
197 extern void diff_flush(struct diff_options*);
198
199 /* diff-raw status letters */
200 #define DIFF_STATUS_ADDED 'A'
201 #define DIFF_STATUS_COPIED 'C'
202 #define DIFF_STATUS_DELETED 'D'
203 #define DIFF_STATUS_MODIFIED 'M'
204 #define DIFF_STATUS_RENAMED 'R'
205 #define DIFF_STATUS_TYPE_CHANGED 'T'
206 #define DIFF_STATUS_UNKNOWN 'X'
207 #define DIFF_STATUS_UNMERGED 'U'
208
209 /* these are not diff-raw status letters proper, but used by
210 * diffcore-filter insn to specify additional restrictions.
211 */
212 #define DIFF_STATUS_FILTER_AON '*'
213 #define DIFF_STATUS_FILTER_BROKEN 'B'
214
215 extern const char *diff_unique_abbrev(const unsigned char *, int);
216
217 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
218
219 extern int run_diff_index(struct rev_info *revs, int cached);
220
221 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
222
223 #endif /* DIFF_H */