]> git.ipfire.org Git - thirdparty/git.git/blame - diff.h
Fix some printf format warnings
[thirdparty/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,
fd55a19e 17 const char *fullpath);
ac1b3d12
LT
18
19typedef void (*add_remove_fn_t)(struct diff_options *options,
20 int addremove, unsigned mode,
21 const unsigned char *sha1,
fd55a19e 22 const char *fullpath);
ac1b3d12 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
7df7c019 33#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349
TH
34
35/* These override all above */
74e2abe5
JH
36#define DIFF_FORMAT_NAME 0x0100
37#define DIFF_FORMAT_NAME_STATUS 0x0200
38#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349
TH
39
40/* Same as output_format = 0 but we know that -s flag was given
41 * and we should not give default value to output_format.
42 */
74e2abe5 43#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349 44
74e2abe5 45#define DIFF_FORMAT_CALLBACK 0x1000
04245581 46
8f67f8ae
PH
47#define DIFF_OPT_RECURSIVE (1 << 0)
48#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
49#define DIFF_OPT_BINARY (1 << 2)
50#define DIFF_OPT_TEXT (1 << 3)
51#define DIFF_OPT_FULL_INDEX (1 << 4)
52#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
53#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
54#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
55#define DIFF_OPT_COLOR_DIFF (1 << 8)
56#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
57#define DIFF_OPT_HAS_CHANGES (1 << 10)
58#define DIFF_OPT_QUIET (1 << 11)
59#define DIFF_OPT_NO_INDEX (1 << 12)
60#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
61#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
62#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895 63#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51 64#define DIFF_OPT_RELATIVE_NAME (1 << 17)
50fd9bd8 65#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
f88d225f 66#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
fd33777b 67#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
c7534ef4 68#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
8f67f8ae
PH
69#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
70#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
71#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
628d5c2b
KC
72#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
73#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
74#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae 75
6b5ee137 76struct diff_options {
6b5ee137
JH
77 const char *filter;
78 const char *orderfile;
79 const char *pickaxe;
2f3f8b21 80 const char *single_follow;
eab9a40b 81 const char *a_prefix, *b_prefix;
8f67f8ae 82 unsigned flags;
ee1e5412 83 int context;
6d0e674a 84 int interhunkcontext;
6b5ee137
JH
85 int break_opt;
86 int detect_rename;
fb13227e 87 int skip_stat_unmatch;
6b5ee137
JH
88 int line_termination;
89 int output_format;
90 int pickaxe_opts;
91 int rename_score;
8082d8d3 92 int rename_limit;
b8960bbe 93 int warn_on_too_large_rename;
7df7c019 94 int dirstat_percent;
6b5ee137 95 int setup;
47dd0d59 96 int abbrev;
cd676a51
JH
97 const char *prefix;
98 int prefix_length;
698ce6f8 99 const char *stat_sep;
0d21efa5 100 long xdl_opts;
ac1b3d12 101
a2540023
JH
102 int stat_width;
103 int stat_name_width;
2b6a5417 104 const char *word_regex;
a2540023 105
34a5e1a2
JS
106 /* this is set by diffcore for DIFF_FORMAT_PATCH */
107 int found_changes;
108
c0c77734
DB
109 FILE *file;
110 int close_file;
111
a8baa7b9
JH
112 int nr_paths;
113 const char **paths;
114 int *pathlens;
ac1b3d12
LT
115 change_fn_t change;
116 add_remove_fn_t add_remove;
04245581
JK
117 diff_format_fn_t format_callback;
118 void *format_callback_data;
6b5ee137
JH
119};
120
ce436973
JK
121enum color_diff {
122 DIFF_RESET = 0,
123 DIFF_PLAIN = 1,
124 DIFF_METAINFO = 2,
125 DIFF_FRAGINFO = 3,
126 DIFF_FILE_OLD = 4,
127 DIFF_FILE_NEW = 5,
128 DIFF_COMMIT = 6,
448c3ef1 129 DIFF_WHITESPACE = 7,
ce436973
JK
130};
131const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae
PH
132#define diff_get_color_opt(o, ix) \
133 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
134
ce436973 135
698ce6f8
JS
136extern const char mime_boundary_leader[];
137
a8baa7b9
JH
138extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
139extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
140extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
141 const char *base, struct diff_options *opt);
142extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
143 const char *base, struct diff_options *opt);
2b60356d
RS
144extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
145 struct diff_options *opt);
ac1b3d12 146
ea726d02
JH
147struct combine_diff_path {
148 struct combine_diff_path *next;
149 int len;
150 char *path;
2454c962 151 unsigned int mode;
ea726d02 152 unsigned char sha1[20];
2454c962 153 struct combine_diff_parent {
d416df88 154 char status;
2454c962
JH
155 unsigned int mode;
156 unsigned char sha1[20];
157 } parent[FLEX_ARRAY];
ea726d02 158};
2454c962
JH
159#define combine_diff_path_size(n, l) \
160 (sizeof(struct combine_diff_path) + \
161 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 162
91539833
LT
163extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
164 int dense, struct rev_info *);
ea726d02 165
0fe7c1de
JH
166extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
167
91539833 168extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
af3feefa 169
a5a818ee
JH
170void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
171
6b5ee137
JH
172extern void diff_addremove(struct diff_options *,
173 int addremove,
77eb2720
JH
174 unsigned mode,
175 const unsigned char *sha1,
fd55a19e 176 const char *fullpath);
77eb2720 177
6b5ee137
JH
178extern void diff_change(struct diff_options *,
179 unsigned mode1, unsigned mode2,
180 const unsigned char *sha1,
181 const unsigned char *sha2,
fd55a19e 182 const char *fullpath);
77eb2720 183
6b5ee137 184extern void diff_unmerge(struct diff_options *,
e9c84099
JH
185 const char *path,
186 unsigned mode,
187 const unsigned char *sha1);
77eb2720 188
19feebc8 189#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
190#define DIFF_SETUP_USE_CACHE 2
191#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 192
ef90d6d4
JS
193extern int git_diff_basic_config(const char *var, const char *value, void *cb);
194extern int git_diff_ui_config(const char *var, const char *value, void *cb);
6b2f2d98 195extern int diff_use_color_default;
6b5ee137
JH
196extern void diff_setup(struct diff_options *);
197extern int diff_opt_parse(struct diff_options *, const char **, int);
198extern int diff_setup_done(struct diff_options *);
86436c28 199
6b14d7fa
JH
200#define DIFF_DETECT_RENAME 1
201#define DIFF_DETECT_COPY 2
202
367cec1c 203#define DIFF_PICKAXE_ALL 1
d01d8c67 204#define DIFF_PICKAXE_REGEX 2
f345b0a0 205
6b5ee137 206extern void diffcore_std(struct diff_options *);
f2ce9fde 207
dda2d79a
JH
208#define COMMON_DIFF_OPTIONS_HELP \
209"\ncommon diff options:\n" \
8082d8d3
JH
210" -z output diff-raw with lines terminated with NUL.\n" \
211" -p output patch format.\n" \
212" -u synonym for -p.\n" \
5c91da25
PB
213" --patch-with-raw\n" \
214" output both a patch and the diff-raw format.\n" \
d75f7952 215" --stat show diffstat instead of patch.\n" \
74e2abe5 216" --numstat show numeric diffstat instead of patch.\n" \
29353273
JS
217" --patch-with-stat\n" \
218" output a patch and prepend its diffstat.\n" \
8082d8d3 219" --name-only show only names of changed files.\n" \
946f5f7c 220" --name-status show names and status of changed files.\n" \
47dd0d59 221" --full-index show full object name on index lines.\n" \
913419fc 222" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
223" -R swap input file pairs.\n" \
224" -B detect complete rewrites.\n" \
225" -M detect renames.\n" \
226" -C detect copies.\n" \
dda2d79a 227" --find-copies-harder\n" \
8082d8d3
JH
228" try unchanged files as candidate for copy detection.\n" \
229" -l<n> limit rename attempts up to <n> paths.\n" \
230" -O<file> reorder diffs according to the <file>.\n" \
231" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 232" --pickaxe-all\n" \
ca49920f
SF
233" show all files diff when -S is used and hit is found.\n" \
234" -a --text treat all files as text.\n"
dda2d79a 235
38c6f780 236extern int diff_queue_is_empty(void);
6b5ee137 237extern void diff_flush(struct diff_options*);
86436c28 238
e7baa4f4 239/* diff-raw status letters */
ca8c9156 240#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
241#define DIFF_STATUS_COPIED 'C'
242#define DIFF_STATUS_DELETED 'D'
243#define DIFF_STATUS_MODIFIED 'M'
244#define DIFF_STATUS_RENAMED 'R'
245#define DIFF_STATUS_TYPE_CHANGED 'T'
246#define DIFF_STATUS_UNKNOWN 'X'
247#define DIFF_STATUS_UNMERGED 'U'
248
249/* these are not diff-raw status letters proper, but used by
250 * diffcore-filter insn to specify additional restrictions.
251 */
0b34379a 252#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
253#define DIFF_STATUS_FILTER_BROKEN 'B'
254
47dd0d59
JH
255extern const char *diff_unique_abbrev(const unsigned char *, int);
256
4bd5b7da
JH
257/* do not report anything on removed paths */
258#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8
JH
259/* report racily-clean paths as modified */
260#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da 261extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e 262extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 263
1cfe7733 264extern int do_diff_cache(const unsigned char *, struct diff_options *);
fcb3d0ad
JS
265extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
266
da31b358
JH
267extern int diff_result_code(struct diff_options *, int);
268
0569e9b8
JH
269extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
270
75f3ff2e
SB
271extern int index_differs_from(const char *def, int diff_flags);
272
86436c28 273#endif /* DIFF_H */