|
diff --git a/cgit.h b/cgit.h index b7f8827..24b02d7 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -14,16 +14,17 @@ |
14 | #include <refs.h> |
14 | #include <refs.h> |
15 | #include <revision.h> |
15 | #include <revision.h> |
16 | #include <log-tree.h> |
16 | #include <log-tree.h> |
17 | #include <archive.h> |
17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> |
18 | #include <xdiff/xdiff.h> |
19 | |
19 | |
20 | |
20 | |
21 | typedef void (*configfn)(const char *name, const char *value); |
21 | typedef void (*configfn)(const char *name, const char *value); |
| |
22 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
22 | |
23 | |
23 | struct cacheitem { |
24 | struct cacheitem { |
24 | char *name; |
25 | char *name; |
25 | struct stat st; |
26 | struct stat st; |
26 | int ttl; |
27 | int ttl; |
27 | int fd; |
28 | int fd; |
28 | }; |
29 | }; |
29 | |
30 | |
@@ -111,16 +112,20 @@ extern void cgit_repo_config_cb(const char *name, const char *value); |
111 | extern void cgit_querystring_cb(const char *name, const char *value); |
112 | extern void cgit_querystring_cb(const char *name, const char *value); |
112 | |
113 | |
113 | extern int chk_zero(int result, char *msg); |
114 | extern int chk_zero(int result, char *msg); |
114 | extern int chk_positive(int result, char *msg); |
115 | extern int chk_positive(int result, char *msg); |
115 | |
116 | |
116 | extern int hextoint(char c); |
117 | extern int hextoint(char c); |
117 | |
118 | |
118 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
119 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
| |
120 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
| |
121 | const unsigned char *new_sha1, |
| |
122 | filepair_fn fn); |
| |
123 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
119 | |
124 | |
120 | extern char *fmt(const char *format,...); |
125 | extern char *fmt(const char *format,...); |
121 | |
126 | |
122 | extern void html(const char *txt); |
127 | extern void html(const char *txt); |
123 | extern void htmlf(const char *format,...); |
128 | extern void htmlf(const char *format,...); |
124 | extern void html_txt(char *txt); |
129 | extern void html_txt(char *txt); |
125 | extern void html_ntxt(int len, char *txt); |
130 | extern void html_ntxt(int len, char *txt); |
126 | extern void html_attr(char *txt); |
131 | extern void html_attr(char *txt); |
|
|
diff --git a/shared.c b/shared.c index 19d2df0..f8a17b6 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -190,8 +190,51 @@ int hextoint(char c) |
190 | else if (c >= 'A' && c <= 'F') |
190 | else if (c >= 'A' && c <= 'F') |
191 | return 10 + c - 'A'; |
191 | return 10 + c - 'A'; |
192 | else if (c >= '0' && c <= '9') |
192 | else if (c >= '0' && c <= '9') |
193 | return c - '0'; |
193 | return c - '0'; |
194 | else |
194 | else |
195 | return -1; |
195 | return -1; |
196 | } |
196 | } |
197 | |
197 | |
| |
198 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
| |
199 | struct diff_options *options, void *data) |
| |
200 | { |
| |
201 | int i; |
| |
202 | |
| |
203 | for (i = 0; i < q->nr; i++) { |
| |
204 | if (q->queue[i]->status == 'U') |
| |
205 | continue; |
| |
206 | ((filepair_fn)data)(q->queue[i]); |
| |
207 | } |
| |
208 | } |
| |
209 | |
| |
210 | void cgit_diff_tree(const unsigned char *old_sha1, |
| |
211 | const unsigned char *new_sha1, |
| |
212 | filepair_fn fn) |
| |
213 | { |
| |
214 | struct diff_options opt; |
| |
215 | int ret; |
| |
216 | |
| |
217 | diff_setup(&opt); |
| |
218 | opt.output_format = DIFF_FORMAT_CALLBACK; |
| |
219 | opt.detect_rename = 1; |
| |
220 | opt.recursive = 1; |
| |
221 | opt.format_callback = cgit_diff_tree_cb; |
| |
222 | opt.format_callback_data = fn; |
| |
223 | diff_setup_done(&opt); |
| |
224 | |
| |
225 | if (old_sha1) |
| |
226 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
| |
227 | else |
| |
228 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
| |
229 | diffcore_std(&opt); |
| |
230 | diff_flush(&opt); |
| |
231 | } |
| |
232 | |
| |
233 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
| |
234 | { |
| |
235 | unsigned char *old_sha1 = NULL; |
| |
236 | |
| |
237 | if (commit->parents) |
| |
238 | old_sha1 = commit->parents->item->object.sha1; |
| |
239 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
| |
240 | } |
|