diff --stat: allow custom diffstat output width.
[git/git.git] / diff.h
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
6
7 #include "tree-walk.h"
8
9 struct rev_info;
10 struct diff_options;
11 struct diff_queue_struct;
12
13 typedef 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
19 typedef 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
24 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
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
42 #define DIFF_FORMAT_CALLBACK 0x0100
43
44 struct diff_options {
45 const char *filter;
46 const char *orderfile;
47 const char *pickaxe;
48 unsigned recursive:1,
49 tree_in_recursive:1,
50 binary:1,
51 text:1,
52 full_index:1,
53 silent_on_remove:1,
54 find_copies_harder:1,
55 color_diff:1,
56 color_diff_words:1;
57 int context;
58 int break_opt;
59 int detect_rename;
60 int line_termination;
61 int output_format;
62 int pickaxe_opts;
63 int rename_score;
64 int reverse_diff;
65 int rename_limit;
66 int setup;
67 int abbrev;
68 const char *msg_sep;
69 const char *stat_sep;
70 long xdl_opts;
71
72 int stat_width;
73 int stat_name_width;
74
75 int nr_paths;
76 const char **paths;
77 int *pathlens;
78 change_fn_t change;
79 add_remove_fn_t add_remove;
80 diff_format_fn_t format_callback;
81 void *format_callback_data;
82 };
83
84 enum color_diff {
85 DIFF_RESET = 0,
86 DIFF_PLAIN = 1,
87 DIFF_METAINFO = 2,
88 DIFF_FRAGINFO = 3,
89 DIFF_FILE_OLD = 4,
90 DIFF_FILE_NEW = 5,
91 DIFF_COMMIT = 6,
92 };
93 const char *diff_get_color(int diff_use_color, enum color_diff ix);
94
95 extern const char mime_boundary_leader[];
96
97 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
98 extern void diff_tree_release_paths(struct diff_options *);
99 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
100 const char *base, struct diff_options *opt);
101 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
102 const char *base, struct diff_options *opt);
103
104 struct combine_diff_path {
105 struct combine_diff_path *next;
106 int len;
107 char *path;
108 unsigned int mode;
109 unsigned char sha1[20];
110 struct combine_diff_parent {
111 char status;
112 unsigned int mode;
113 unsigned char sha1[20];
114 } parent[FLEX_ARRAY];
115 };
116 #define combine_diff_path_size(n, l) \
117 (sizeof(struct combine_diff_path) + \
118 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
119
120 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
121 int dense, struct rev_info *);
122
123 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
124
125 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
126
127 extern void diff_addremove(struct diff_options *,
128 int addremove,
129 unsigned mode,
130 const unsigned char *sha1,
131 const char *base,
132 const char *path);
133
134 extern void diff_change(struct diff_options *,
135 unsigned mode1, unsigned mode2,
136 const unsigned char *sha1,
137 const unsigned char *sha2,
138 const char *base, const char *path);
139
140 extern void diff_unmerge(struct diff_options *,
141 const char *path);
142
143 extern int diff_scoreopt_parse(const char *opt);
144
145 #define DIFF_SETUP_REVERSE 1
146 #define DIFF_SETUP_USE_CACHE 2
147 #define DIFF_SETUP_USE_SIZE_CACHE 4
148
149 extern int git_diff_ui_config(const char *var, const char *value);
150 extern void diff_setup(struct diff_options *);
151 extern int diff_opt_parse(struct diff_options *, const char **, int);
152 extern int diff_setup_done(struct diff_options *);
153
154 #define DIFF_DETECT_RENAME 1
155 #define DIFF_DETECT_COPY 2
156
157 #define DIFF_PICKAXE_ALL 1
158 #define DIFF_PICKAXE_REGEX 2
159
160 extern void diffcore_std(struct diff_options *);
161
162 extern void diffcore_std_no_resolve(struct diff_options *);
163
164 #define COMMON_DIFF_OPTIONS_HELP \
165 "\ncommon diff options:\n" \
166 " -z output diff-raw with lines terminated with NUL.\n" \
167 " -p output patch format.\n" \
168 " -u synonym for -p.\n" \
169 " --patch-with-raw\n" \
170 " output both a patch and the diff-raw format.\n" \
171 " --stat show diffstat instead of patch.\n" \
172 " --patch-with-stat\n" \
173 " output a patch and prepend its diffstat.\n" \
174 " --name-only show only names of changed files.\n" \
175 " --name-status show names and status of changed files.\n" \
176 " --full-index show full object name on index lines.\n" \
177 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
178 " -R swap input file pairs.\n" \
179 " -B detect complete rewrites.\n" \
180 " -M detect renames.\n" \
181 " -C detect copies.\n" \
182 " --find-copies-harder\n" \
183 " try unchanged files as candidate for copy detection.\n" \
184 " -l<n> limit rename attempts up to <n> paths.\n" \
185 " -O<file> reorder diffs according to the <file>.\n" \
186 " -S<string> find filepair whose only one side contains the string.\n" \
187 " --pickaxe-all\n" \
188 " show all files diff when -S is used and hit is found.\n" \
189 " -a --text treat all files as text.\n"
190
191 extern int diff_queue_is_empty(void);
192 extern void diff_flush(struct diff_options*);
193
194 /* diff-raw status letters */
195 #define DIFF_STATUS_ADDED 'A'
196 #define DIFF_STATUS_COPIED 'C'
197 #define DIFF_STATUS_DELETED 'D'
198 #define DIFF_STATUS_MODIFIED 'M'
199 #define DIFF_STATUS_RENAMED 'R'
200 #define DIFF_STATUS_TYPE_CHANGED 'T'
201 #define DIFF_STATUS_UNKNOWN 'X'
202 #define DIFF_STATUS_UNMERGED 'U'
203
204 /* these are not diff-raw status letters proper, but used by
205 * diffcore-filter insn to specify additional restrictions.
206 */
207 #define DIFF_STATUS_FILTER_AON '*'
208 #define DIFF_STATUS_FILTER_BROKEN 'B'
209
210 extern const char *diff_unique_abbrev(const unsigned char *, int);
211
212 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
213
214 extern int run_diff_index(struct rev_info *revs, int cached);
215
216 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
217
218 #endif /* DIFF_H */