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