Add option to set initial In-Reply-To/References
[git/jrn.git] / diff.h
bloba06f959938d1313e45daa610a1f3eb71b4c3f835
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
7 #include "tree-walk.h"
9 struct rev_info;
10 struct diff_options;
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);
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);
23 #define DIFF_FORMAT_RAW 0x0001
24 #define DIFF_FORMAT_DIFFSTAT 0x0002
25 #define DIFF_FORMAT_SUMMARY 0x0004
26 #define DIFF_FORMAT_PATCH 0x0008
28 /* These override all above */
29 #define DIFF_FORMAT_NAME 0x0010
30 #define DIFF_FORMAT_NAME_STATUS 0x0020
31 #define DIFF_FORMAT_CHECKDIFF 0x0040
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.
36 #define DIFF_FORMAT_NO_OUTPUT 0x0080
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 int context;
51 int break_opt;
52 int detect_rename;
53 int line_termination;
54 int output_format;
55 int pickaxe_opts;
56 int rename_score;
57 int reverse_diff;
58 int rename_limit;
59 int setup;
60 int abbrev;
61 const char *msg_sep;
62 const char *stat_sep;
63 long xdl_opts;
65 int nr_paths;
66 const char **paths;
67 int *pathlens;
68 change_fn_t change;
69 add_remove_fn_t add_remove;
72 extern const char mime_boundary_leader[];
74 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
75 extern void diff_tree_release_paths(struct diff_options *);
76 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
77 const char *base, struct diff_options *opt);
78 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
79 const char *base, struct diff_options *opt);
81 struct combine_diff_path {
82 struct combine_diff_path *next;
83 int len;
84 char *path;
85 unsigned int mode;
86 unsigned char sha1[20];
87 struct combine_diff_parent {
88 char status;
89 unsigned int mode;
90 unsigned char sha1[20];
91 } parent[FLEX_ARRAY];
93 #define combine_diff_path_size(n, l) \
94 (sizeof(struct combine_diff_path) + \
95 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
97 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
98 int dense, struct rev_info *);
100 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
102 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
104 extern void diff_addremove(struct diff_options *,
105 int addremove,
106 unsigned mode,
107 const unsigned char *sha1,
108 const char *base,
109 const char *path);
111 extern void diff_change(struct diff_options *,
112 unsigned mode1, unsigned mode2,
113 const unsigned char *sha1,
114 const unsigned char *sha2,
115 const char *base, const char *path);
117 extern void diff_unmerge(struct diff_options *,
118 const char *path);
120 extern int diff_scoreopt_parse(const char *opt);
122 #define DIFF_SETUP_REVERSE 1
123 #define DIFF_SETUP_USE_CACHE 2
124 #define DIFF_SETUP_USE_SIZE_CACHE 4
126 extern int git_diff_ui_config(const char *var, const char *value);
127 extern void diff_setup(struct diff_options *);
128 extern int diff_opt_parse(struct diff_options *, const char **, int);
129 extern int diff_setup_done(struct diff_options *);
131 #define DIFF_DETECT_RENAME 1
132 #define DIFF_DETECT_COPY 2
134 #define DIFF_PICKAXE_ALL 1
135 #define DIFF_PICKAXE_REGEX 2
137 extern void diffcore_std(struct diff_options *);
139 extern void diffcore_std_no_resolve(struct diff_options *);
141 #define COMMON_DIFF_OPTIONS_HELP \
142 "\ncommon diff options:\n" \
143 " -z output diff-raw with lines terminated with NUL.\n" \
144 " -p output patch format.\n" \
145 " -u synonym for -p.\n" \
146 " --patch-with-raw\n" \
147 " output both a patch and the diff-raw format.\n" \
148 " --stat show diffstat instead of patch.\n" \
149 " --patch-with-stat\n" \
150 " output a patch and prepend its diffstat.\n" \
151 " --name-only show only names of changed files.\n" \
152 " --name-status show names and status of changed files.\n" \
153 " --full-index show full object name on index lines.\n" \
154 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
155 " -R swap input file pairs.\n" \
156 " -B detect complete rewrites.\n" \
157 " -M detect renames.\n" \
158 " -C detect copies.\n" \
159 " --find-copies-harder\n" \
160 " try unchanged files as candidate for copy detection.\n" \
161 " -l<n> limit rename attempts up to <n> paths.\n" \
162 " -O<file> reorder diffs according to the <file>.\n" \
163 " -S<string> find filepair whose only one side contains the string.\n" \
164 " --pickaxe-all\n" \
165 " show all files diff when -S is used and hit is found.\n" \
166 " -a --text treat all files as text.\n"
168 extern int diff_queue_is_empty(void);
169 extern void diff_flush(struct diff_options*);
171 /* diff-raw status letters */
172 #define DIFF_STATUS_ADDED 'A'
173 #define DIFF_STATUS_COPIED 'C'
174 #define DIFF_STATUS_DELETED 'D'
175 #define DIFF_STATUS_MODIFIED 'M'
176 #define DIFF_STATUS_RENAMED 'R'
177 #define DIFF_STATUS_TYPE_CHANGED 'T'
178 #define DIFF_STATUS_UNKNOWN 'X'
179 #define DIFF_STATUS_UNMERGED 'U'
181 /* these are not diff-raw status letters proper, but used by
182 * diffcore-filter insn to specify additional restrictions.
184 #define DIFF_STATUS_FILTER_AON '*'
185 #define DIFF_STATUS_FILTER_BROKEN 'B'
187 extern const char *diff_unique_abbrev(const unsigned char *, int);
189 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
191 extern int run_diff_index(struct rev_info *revs, int cached);
193 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
195 #endif /* DIFF_H */