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