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