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