]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
86436c28 JH |
4 | #ifndef DIFF_H |
5 | #define DIFF_H | |
6 | ||
1b0c7174 | 7 | #include "tree-walk.h" |
50f9a858 | 8 | |
91539833 | 9 | struct rev_info; |
ac1b3d12 LT |
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 | ||
6b5ee137 | 23 | struct diff_options { |
6b5ee137 JH |
24 | const char *filter; |
25 | const char *orderfile; | |
26 | const char *pickaxe; | |
ac1b3d12 | 27 | unsigned recursive:1, |
86ff1d20 | 28 | with_raw:1, |
29353273 | 29 | with_stat:1, |
80b1e511 | 30 | tree_in_recursive:1, |
0660626c | 31 | binary:1, |
6973dcae JH |
32 | full_index:1, |
33 | silent_on_remove:1, | |
34 | find_copies_harder:1; | |
ee1e5412 | 35 | int context; |
6b5ee137 JH |
36 | int break_opt; |
37 | int detect_rename; | |
6b5ee137 JH |
38 | int line_termination; |
39 | int output_format; | |
40 | int pickaxe_opts; | |
41 | int rename_score; | |
42 | int reverse_diff; | |
8082d8d3 | 43 | int rename_limit; |
6b5ee137 | 44 | int setup; |
47dd0d59 | 45 | int abbrev; |
ac1b3d12 | 46 | |
a8baa7b9 JH |
47 | int nr_paths; |
48 | const char **paths; | |
49 | int *pathlens; | |
ac1b3d12 LT |
50 | change_fn_t change; |
51 | add_remove_fn_t add_remove; | |
6b5ee137 JH |
52 | }; |
53 | ||
a8baa7b9 JH |
54 | extern void diff_tree_setup_paths(const char **paths, struct diff_options *); |
55 | extern void diff_tree_release_paths(struct diff_options *); | |
ac1b3d12 LT |
56 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |
57 | const char *base, struct diff_options *opt); | |
58 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, | |
59 | const char *base, struct diff_options *opt); | |
60 | ||
ea726d02 JH |
61 | struct combine_diff_path { |
62 | struct combine_diff_path *next; | |
63 | int len; | |
64 | char *path; | |
2454c962 | 65 | unsigned int mode; |
ea726d02 | 66 | unsigned char sha1[20]; |
2454c962 | 67 | struct combine_diff_parent { |
d416df88 | 68 | char status; |
2454c962 JH |
69 | unsigned int mode; |
70 | unsigned char sha1[20]; | |
71 | } parent[FLEX_ARRAY]; | |
ea726d02 | 72 | }; |
2454c962 JH |
73 | #define combine_diff_path_size(n, l) \ |
74 | (sizeof(struct combine_diff_path) + \ | |
75 | sizeof(struct combine_diff_parent) * (n) + (l) + 1) | |
ea726d02 | 76 | |
91539833 LT |
77 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
78 | int dense, struct rev_info *); | |
ea726d02 | 79 | |
0fe7c1de JH |
80 | extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev); |
81 | ||
91539833 | 82 | extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *); |
af3feefa | 83 | |
6b5ee137 JH |
84 | extern void diff_addremove(struct diff_options *, |
85 | int addremove, | |
77eb2720 JH |
86 | unsigned mode, |
87 | const unsigned char *sha1, | |
88 | const char *base, | |
89 | const char *path); | |
90 | ||
6b5ee137 JH |
91 | extern void diff_change(struct diff_options *, |
92 | unsigned mode1, unsigned mode2, | |
93 | const unsigned char *sha1, | |
94 | const unsigned char *sha2, | |
95 | const char *base, const char *path); | |
77eb2720 | 96 | |
6b5ee137 JH |
97 | extern void diff_unmerge(struct diff_options *, |
98 | const char *path); | |
77eb2720 | 99 | |
57fe64a4 JH |
100 | extern int diff_scoreopt_parse(const char *opt); |
101 | ||
19feebc8 | 102 | #define DIFF_SETUP_REVERSE 1 |
f0c6b2a2 JH |
103 | #define DIFF_SETUP_USE_CACHE 2 |
104 | #define DIFF_SETUP_USE_SIZE_CACHE 4 | |
ce240675 | 105 | |
9ce392f4 | 106 | extern int git_diff_config(const char *var, const char *value); |
6b5ee137 JH |
107 | extern void diff_setup(struct diff_options *); |
108 | extern int diff_opt_parse(struct diff_options *, const char **, int); | |
109 | extern int diff_setup_done(struct diff_options *); | |
86436c28 | 110 | |
6b14d7fa JH |
111 | #define DIFF_DETECT_RENAME 1 |
112 | #define DIFF_DETECT_COPY 2 | |
113 | ||
367cec1c | 114 | #define DIFF_PICKAXE_ALL 1 |
d01d8c67 | 115 | #define DIFF_PICKAXE_REGEX 2 |
f345b0a0 | 116 | |
6b5ee137 | 117 | extern void diffcore_std(struct diff_options *); |
f2ce9fde | 118 | |
6b5ee137 | 119 | extern void diffcore_std_no_resolve(struct diff_options *); |
befe8639 | 120 | |
dda2d79a JH |
121 | #define COMMON_DIFF_OPTIONS_HELP \ |
122 | "\ncommon diff options:\n" \ | |
8082d8d3 JH |
123 | " -z output diff-raw with lines terminated with NUL.\n" \ |
124 | " -p output patch format.\n" \ | |
125 | " -u synonym for -p.\n" \ | |
5c91da25 PB |
126 | " --patch-with-raw\n" \ |
127 | " output both a patch and the diff-raw format.\n" \ | |
d75f7952 | 128 | " --stat show diffstat instead of patch.\n" \ |
29353273 JS |
129 | " --patch-with-stat\n" \ |
130 | " output a patch and prepend its diffstat.\n" \ | |
8082d8d3 | 131 | " --name-only show only names of changed files.\n" \ |
946f5f7c | 132 | " --name-status show names and status of changed files.\n" \ |
47dd0d59 | 133 | " --full-index show full object name on index lines.\n" \ |
913419fc | 134 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
8082d8d3 JH |
135 | " -R swap input file pairs.\n" \ |
136 | " -B detect complete rewrites.\n" \ | |
137 | " -M detect renames.\n" \ | |
138 | " -C detect copies.\n" \ | |
dda2d79a | 139 | " --find-copies-harder\n" \ |
8082d8d3 JH |
140 | " try unchanged files as candidate for copy detection.\n" \ |
141 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
142 | " -O<file> reorder diffs according to the <file>.\n" \ | |
143 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
dda2d79a | 144 | " --pickaxe-all\n" \ |
8082d8d3 | 145 | " show all files diff when -S is used and hit is found.\n" |
dda2d79a | 146 | |
38c6f780 JH |
147 | extern int diff_queue_is_empty(void); |
148 | ||
e68b6f15 | 149 | #define DIFF_FORMAT_RAW 1 |
19feebc8 JH |
150 | #define DIFF_FORMAT_PATCH 2 |
151 | #define DIFF_FORMAT_NO_OUTPUT 3 | |
52f28529 | 152 | #define DIFF_FORMAT_NAME 4 |
946f5f7c | 153 | #define DIFF_FORMAT_NAME_STATUS 5 |
d75f7952 | 154 | #define DIFF_FORMAT_DIFFSTAT 6 |
19feebc8 | 155 | |
6b5ee137 | 156 | extern void diff_flush(struct diff_options*); |
86436c28 | 157 | |
e7baa4f4 | 158 | /* diff-raw status letters */ |
ca8c9156 | 159 | #define DIFF_STATUS_ADDED 'A' |
e7baa4f4 JH |
160 | #define DIFF_STATUS_COPIED 'C' |
161 | #define DIFF_STATUS_DELETED 'D' | |
162 | #define DIFF_STATUS_MODIFIED 'M' | |
163 | #define DIFF_STATUS_RENAMED 'R' | |
164 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
165 | #define DIFF_STATUS_UNKNOWN 'X' | |
166 | #define DIFF_STATUS_UNMERGED 'U' | |
167 | ||
168 | /* these are not diff-raw status letters proper, but used by | |
169 | * diffcore-filter insn to specify additional restrictions. | |
170 | */ | |
0b34379a | 171 | #define DIFF_STATUS_FILTER_AON '*' |
e7baa4f4 JH |
172 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
173 | ||
47dd0d59 JH |
174 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
175 | ||
6973dcae JH |
176 | extern int run_diff_files(struct rev_info *revs, int silent_on_removed); |
177 | ||
5c21ac0e | 178 | extern int run_diff_index(struct rev_info *revs, int cached); |
e09ad6e1 | 179 | |
86436c28 | 180 | #endif /* DIFF_H */ |