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