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