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