|
diff --git a/shared.c b/shared.c index 19d2df0..f8a17b6 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -65,26 +65,26 @@ int chk_positive(int result, char *msg) |
65 | return result; |
65 | return result; |
66 | } |
66 | } |
67 | |
67 | |
68 | struct repoinfo *add_repo(const char *url) |
68 | struct repoinfo *add_repo(const char *url) |
69 | { |
69 | { |
70 | struct repoinfo *ret; |
70 | struct repoinfo *ret; |
71 | |
71 | |
72 | if (++cgit_repolist.count > cgit_repolist.length) { |
72 | if (++cgit_repolist.count > cgit_repolist.length) { |
73 | if (cgit_repolist.length == 0) |
73 | if (cgit_repolist.length == 0) |
74 | cgit_repolist.length = 8; |
74 | cgit_repolist.length = 8; |
75 | else |
75 | else |
76 | cgit_repolist.length *= 2; |
76 | cgit_repolist.length *= 2; |
77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
78 | cgit_repolist.length * |
78 | cgit_repolist.length * |
79 | sizeof(struct repoinfo)); |
79 | sizeof(struct repoinfo)); |
80 | } |
80 | } |
81 | |
81 | |
82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret->url = xstrdup(url); |
83 | ret->url = xstrdup(url); |
84 | ret->name = ret->url; |
84 | ret->name = ret->url; |
85 | ret->path = NULL; |
85 | ret->path = NULL; |
86 | ret->desc = NULL; |
86 | ret->desc = NULL; |
87 | ret->owner = NULL; |
87 | ret->owner = NULL; |
88 | ret->snapshots = cgit_snapshots; |
88 | ret->snapshots = cgit_snapshots; |
89 | ret->module_link = cgit_module_link; |
89 | ret->module_link = cgit_module_link; |
90 | return ret; |
90 | return ret; |
@@ -186,12 +186,55 @@ void *cgit_free_commitinfo(struct commitinfo *info) |
186 | int hextoint(char c) |
186 | int hextoint(char c) |
187 | { |
187 | { |
188 | if (c >= 'a' && c <= 'f') |
188 | if (c >= 'a' && c <= 'f') |
189 | return 10 + c - 'a'; |
189 | return 10 + c - 'a'; |
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 | } |
|