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