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