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