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 color_diff:1,
59 color_diff_words:1,
60 has_changes:1,
61 quiet:1,
62 allow_external:1,
63 exit_with_status:1;
64 int context;
65 int break_opt;
66 int detect_rename;
67 int line_termination;
68 int output_format;
69 int pickaxe_opts;
70 int rename_score;
71 int reverse_diff;
72 int rename_limit;
73 int setup;
74 int abbrev;
75 const char *msg_sep;
76 const char *stat_sep;
77 long xdl_opts;
78 int stat_width;
80 int stat_name_width;
81 /* this is set by diffcore for DIFF_FORMAT_PATCH */
83 int found_changes;
84 int nr_paths;
86 const char **paths;
87 int *pathlens;
88 change_fn_t change;
89 add_remove_fn_t add_remove;
90 diff_format_fn_t format_callback;
91 void *format_callback_data;
92};
93enum color_diff {
95 DIFF_RESET = 0,
96 DIFF_PLAIN = 1,
97 DIFF_METAINFO = 2,
98 DIFF_FRAGINFO = 3,
99 DIFF_FILE_OLD = 4,
100 DIFF_FILE_NEW = 5,
101 DIFF_COMMIT = 6,
102 DIFF_WHITESPACE = 7,
103};
104const char *diff_get_color(int diff_use_color, enum color_diff ix);
105extern const char mime_boundary_leader[];
107extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
109extern void diff_tree_release_paths(struct diff_options *);
110extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
111 const char *base, struct diff_options *opt);
112extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
113 const char *base, struct diff_options *opt);
114extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
115 struct diff_options *opt);
116struct combine_diff_path {
118 struct combine_diff_path *next;
119 int len;
120 char *path;
121 unsigned int mode;
122 unsigned char sha1[20];
123 struct combine_diff_parent {
124 char status;
125 unsigned int mode;
126 unsigned char sha1[20];
127 } parent[FLEX_ARRAY];
128};
129#define combine_diff_path_size(n, l) \
130 (sizeof(struct combine_diff_path) + \
131 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
132extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
134 int dense, struct rev_info *);
135extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
137extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
139extern void diff_addremove(struct diff_options *,
141 int addremove,
142 unsigned mode,
143 const unsigned char *sha1,
144 const char *base,
145 const char *path);
146extern void diff_change(struct diff_options *,
148 unsigned mode1, unsigned mode2,
149 const unsigned char *sha1,
150 const unsigned char *sha2,
151 const char *base, const char *path);
152extern void diff_unmerge(struct diff_options *,
154 const char *path,
155 unsigned mode,
156 const unsigned char *sha1);
157#define DIFF_SETUP_REVERSE 1
159#define DIFF_SETUP_USE_CACHE 2
160#define DIFF_SETUP_USE_SIZE_CACHE 4
161extern int git_diff_ui_config(const char *var, const char *value);
163extern void diff_setup(struct diff_options *);
164extern int diff_opt_parse(struct diff_options *, const char **, int);
165extern int diff_setup_done(struct diff_options *);
166#define DIFF_DETECT_RENAME 1
168#define DIFF_DETECT_COPY 2
169#define DIFF_PICKAXE_ALL 1
171#define DIFF_PICKAXE_REGEX 2
172extern void diffcore_std(struct diff_options *);
174#define COMMON_DIFF_OPTIONS_HELP \
176"\ncommon diff options:\n" \
177" -z output diff-raw with lines terminated with NUL.\n" \
178" -p output patch format.\n" \
179" -u synonym for -p.\n" \
180" --patch-with-raw\n" \
181" output both a patch and the diff-raw format.\n" \
182" --stat show diffstat instead of patch.\n" \
183" --numstat show numeric diffstat instead of patch.\n" \
184" --patch-with-stat\n" \
185" output a patch and prepend its diffstat.\n" \
186" --name-only show only names of changed files.\n" \
187" --name-status show names and status of changed files.\n" \
188" --full-index show full object name on index lines.\n" \
189" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
190" -R swap input file pairs.\n" \
191" -B detect complete rewrites.\n" \
192" -M detect renames.\n" \
193" -C detect copies.\n" \
194" --find-copies-harder\n" \
195" try unchanged files as candidate for copy detection.\n" \
196" -l<n> limit rename attempts up to <n> paths.\n" \
197" -O<file> reorder diffs according to the <file>.\n" \
198" -S<string> find filepair whose only one side contains the string.\n" \
199" --pickaxe-all\n" \
200" show all files diff when -S is used and hit is found.\n" \
201" -a --text treat all files as text.\n"
202extern int diff_queue_is_empty(void);
204extern void diff_flush(struct diff_options*);
205/* diff-raw status letters */
207#define DIFF_STATUS_ADDED 'A'
208#define DIFF_STATUS_COPIED 'C'
209#define DIFF_STATUS_DELETED 'D'
210#define DIFF_STATUS_MODIFIED 'M'
211#define DIFF_STATUS_RENAMED 'R'
212#define DIFF_STATUS_TYPE_CHANGED 'T'
213#define DIFF_STATUS_UNKNOWN 'X'
214#define DIFF_STATUS_UNMERGED 'U'
215/* these are not diff-raw status letters proper, but used by
217 * diffcore-filter insn to specify additional restrictions.
218 */
219#define DIFF_STATUS_FILTER_AON '*'
220#define DIFF_STATUS_FILTER_BROKEN 'B'
221extern const char *diff_unique_abbrev(const unsigned char *, int);
223extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
225extern int setup_diff_no_index(struct rev_info *revs,
226 int argc, const char ** argv, int nongit, const char *prefix);
227extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
228extern int run_diff_index(struct rev_info *revs, int cached);
230extern int do_diff_cache(const unsigned char *, struct diff_options *);
232extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
233#endif /* DIFF_H */