Code

gitweb: blame table row no highlight fix
[git.git] / diff.h
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.
35  */
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;
70 };
72 enum color_diff {
73         DIFF_RESET = 0,
74         DIFF_PLAIN = 1,
75         DIFF_METAINFO = 2,
76         DIFF_FRAGINFO = 3,
77         DIFF_FILE_OLD = 4,
78         DIFF_FILE_NEW = 5,
79         DIFF_COMMIT = 6,
80 };
81 const char *diff_get_color(int diff_use_color, enum color_diff ix);
83 extern const char mime_boundary_leader[];
85 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
86 extern void diff_tree_release_paths(struct diff_options *);
87 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
88                      const char *base, struct diff_options *opt);
89 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
90                           const char *base, struct diff_options *opt);
92 struct combine_diff_path {
93         struct combine_diff_path *next;
94         int len;
95         char *path;
96         unsigned int mode;
97         unsigned char sha1[20];
98         struct combine_diff_parent {
99                 char status;
100                 unsigned int mode;
101                 unsigned char sha1[20];
102         } parent[FLEX_ARRAY];
103 };
104 #define combine_diff_path_size(n, l) \
105         (sizeof(struct combine_diff_path) + \
106          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
108 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
109                               int dense, struct rev_info *);
111 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
113 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
115 extern void diff_addremove(struct diff_options *,
116                            int addremove,
117                            unsigned mode,
118                            const unsigned char *sha1,
119                            const char *base,
120                            const char *path);
122 extern void diff_change(struct diff_options *,
123                         unsigned mode1, unsigned mode2,
124                         const unsigned char *sha1,
125                         const unsigned char *sha2,
126                         const char *base, const char *path);
128 extern void diff_unmerge(struct diff_options *,
129                          const char *path);
131 extern int diff_scoreopt_parse(const char *opt);
133 #define DIFF_SETUP_REVERSE              1
134 #define DIFF_SETUP_USE_CACHE            2
135 #define DIFF_SETUP_USE_SIZE_CACHE       4
137 extern int git_diff_ui_config(const char *var, const char *value);
138 extern void diff_setup(struct diff_options *);
139 extern int diff_opt_parse(struct diff_options *, const char **, int);
140 extern int diff_setup_done(struct diff_options *);
142 #define DIFF_DETECT_RENAME      1
143 #define DIFF_DETECT_COPY        2
145 #define DIFF_PICKAXE_ALL        1
146 #define DIFF_PICKAXE_REGEX      2
148 extern void diffcore_std(struct diff_options *);
150 extern void diffcore_std_no_resolve(struct diff_options *);
152 #define COMMON_DIFF_OPTIONS_HELP \
153 "\ncommon diff options:\n" \
154 "  -z            output diff-raw with lines terminated with NUL.\n" \
155 "  -p            output patch format.\n" \
156 "  -u            synonym for -p.\n" \
157 "  --patch-with-raw\n" \
158 "                output both a patch and the diff-raw format.\n" \
159 "  --stat        show diffstat instead of patch.\n" \
160 "  --patch-with-stat\n" \
161 "                output a patch and prepend its diffstat.\n" \
162 "  --name-only   show only names of changed files.\n" \
163 "  --name-status show names and status of changed files.\n" \
164 "  --full-index  show full object name on index lines.\n" \
165 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
166 "  -R            swap input file pairs.\n" \
167 "  -B            detect complete rewrites.\n" \
168 "  -M            detect renames.\n" \
169 "  -C            detect copies.\n" \
170 "  --find-copies-harder\n" \
171 "                try unchanged files as candidate for copy detection.\n" \
172 "  -l<n>         limit rename attempts up to <n> paths.\n" \
173 "  -O<file>      reorder diffs according to the <file>.\n" \
174 "  -S<string>    find filepair whose only one side contains the string.\n" \
175 "  --pickaxe-all\n" \
176 "                show all files diff when -S is used and hit is found.\n" \
177 "  -a  --text    treat all files as text.\n"
179 extern int diff_queue_is_empty(void);
180 extern void diff_flush(struct diff_options*);
182 /* diff-raw status letters */
183 #define DIFF_STATUS_ADDED               'A'
184 #define DIFF_STATUS_COPIED              'C'
185 #define DIFF_STATUS_DELETED             'D'
186 #define DIFF_STATUS_MODIFIED            'M'
187 #define DIFF_STATUS_RENAMED             'R'
188 #define DIFF_STATUS_TYPE_CHANGED        'T'
189 #define DIFF_STATUS_UNKNOWN             'X'
190 #define DIFF_STATUS_UNMERGED            'U'
192 /* these are not diff-raw status letters proper, but used by
193  * diffcore-filter insn to specify additional restrictions.
194  */
195 #define DIFF_STATUS_FILTER_AON          '*'
196 #define DIFF_STATUS_FILTER_BROKEN       'B'
198 extern const char *diff_unique_abbrev(const unsigned char *, int);
200 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
202 extern int run_diff_index(struct rev_info *revs, int cached);
204 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
206 #endif /* DIFF_H */