|
diff --git a/shared.c b/shared.c index 072bb6d..8505397 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,324 +1,324 @@ |
1 | /* shared.c: global vars + some callback functions |
1 | /* shared.c: global vars + some callback functions |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | struct repolist cgit_repolist; |
11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; |
12 | struct repoinfo *cgit_repo; |
13 | |
13 | |
14 | char *cgit_root_title = "Git repository browser"; |
14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; |
15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; |
16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; |
19 | char *cgit_virtual_root = NULL; |
20 | |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; |
21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | |
22 | |
23 | int cgit_nocache = 0; |
23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; |
24 | int cgit_snapshots = 0; |
25 | int cgit_max_lock_attempts = 5; |
25 | int cgit_max_lock_attempts = 5; |
26 | int cgit_cache_root_ttl = 5; |
26 | int cgit_cache_root_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; |
29 | int cgit_cache_static_ttl = -1; |
29 | int cgit_cache_static_ttl = -1; |
30 | int cgit_cache_max_create_time = 5; |
30 | int cgit_cache_max_create_time = 5; |
31 | |
31 | |
32 | int cgit_max_msg_len = 60; |
32 | int cgit_max_msg_len = 60; |
33 | int cgit_max_commit_count = 50; |
33 | int cgit_max_commit_count = 50; |
34 | |
34 | |
35 | char *cgit_repo_name = NULL; |
35 | char *cgit_repo_name = NULL; |
36 | char *cgit_repo_desc = NULL; |
36 | char *cgit_repo_desc = NULL; |
37 | char *cgit_repo_owner = NULL; |
37 | char *cgit_repo_owner = NULL; |
38 | |
38 | |
39 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_symref = 0; |
40 | int cgit_query_has_sha1 = 0; |
40 | int cgit_query_has_sha1 = 0; |
41 | |
41 | |
42 | char *cgit_querystring = NULL; |
42 | char *cgit_querystring = NULL; |
43 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_repo = NULL; |
44 | char *cgit_query_page = NULL; |
44 | char *cgit_query_page = NULL; |
45 | char *cgit_query_head = NULL; |
45 | char *cgit_query_head = NULL; |
46 | char *cgit_query_search = NULL; |
46 | char *cgit_query_search = NULL; |
47 | char *cgit_query_sha1 = NULL; |
47 | char *cgit_query_sha1 = NULL; |
48 | char *cgit_query_sha2 = NULL; |
48 | char *cgit_query_sha2 = NULL; |
49 | char *cgit_query_path = NULL; |
49 | char *cgit_query_path = NULL; |
50 | char *cgit_query_name = NULL; |
50 | char *cgit_query_name = NULL; |
51 | int cgit_query_ofs = 0; |
51 | int cgit_query_ofs = 0; |
52 | |
52 | |
53 | int htmlfd = 0; |
53 | int htmlfd = 0; |
54 | |
54 | |
55 | int chk_zero(int result, char *msg) |
55 | int chk_zero(int result, char *msg) |
56 | { |
56 | { |
57 | if (result != 0) |
57 | if (result != 0) |
58 | die("%s: %s", msg, strerror(errno)); |
58 | die("%s: %s", msg, strerror(errno)); |
59 | return result; |
59 | return result; |
60 | } |
60 | } |
61 | |
61 | |
62 | int chk_positive(int result, char *msg) |
62 | int chk_positive(int result, char *msg) |
63 | { |
63 | { |
64 | if (result <= 0) |
64 | if (result <= 0) |
65 | die("%s: %s", msg, strerror(errno)); |
65 | die("%s: %s", msg, strerror(errno)); |
66 | return result; |
66 | return result; |
67 | } |
67 | } |
68 | |
68 | |
69 | struct repoinfo *add_repo(const char *url) |
69 | struct repoinfo *add_repo(const char *url) |
70 | { |
70 | { |
71 | struct repoinfo *ret; |
71 | struct repoinfo *ret; |
72 | |
72 | |
73 | if (++cgit_repolist.count > cgit_repolist.length) { |
73 | if (++cgit_repolist.count > cgit_repolist.length) { |
74 | if (cgit_repolist.length == 0) |
74 | if (cgit_repolist.length == 0) |
75 | cgit_repolist.length = 8; |
75 | cgit_repolist.length = 8; |
76 | else |
76 | else |
77 | cgit_repolist.length *= 2; |
77 | cgit_repolist.length *= 2; |
78 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
78 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
79 | cgit_repolist.length * |
79 | cgit_repolist.length * |
80 | sizeof(struct repoinfo)); |
80 | sizeof(struct repoinfo)); |
81 | } |
81 | } |
82 | |
82 | |
83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
84 | ret->url = xstrdup(url); |
84 | ret->url = xstrdup(url); |
85 | ret->name = ret->url; |
85 | ret->name = ret->url; |
86 | ret->path = NULL; |
86 | ret->path = NULL; |
87 | ret->desc = NULL; |
87 | ret->desc = NULL; |
88 | ret->owner = NULL; |
88 | ret->owner = NULL; |
89 | ret->snapshots = cgit_snapshots; |
89 | ret->snapshots = cgit_snapshots; |
90 | ret->module_link = cgit_module_link; |
90 | ret->module_link = cgit_module_link; |
91 | return ret; |
91 | return ret; |
92 | } |
92 | } |
93 | |
93 | |
94 | void cgit_global_config_cb(const char *name, const char *value) |
94 | void cgit_global_config_cb(const char *name, const char *value) |
95 | { |
95 | { |
96 | if (!strcmp(name, "root-title")) |
96 | if (!strcmp(name, "root-title")) |
97 | cgit_root_title = xstrdup(value); |
97 | cgit_root_title = xstrdup(value); |
98 | else if (!strcmp(name, "css")) |
98 | else if (!strcmp(name, "css")) |
99 | cgit_css = xstrdup(value); |
99 | cgit_css = xstrdup(value); |
100 | else if (!strcmp(name, "logo")) |
100 | else if (!strcmp(name, "logo")) |
101 | cgit_logo = xstrdup(value); |
101 | cgit_logo = xstrdup(value); |
102 | else if (!strcmp(name, "logo-link")) |
102 | else if (!strcmp(name, "logo-link")) |
103 | cgit_logo_link = xstrdup(value); |
103 | cgit_logo_link = xstrdup(value); |
104 | else if (!strcmp(name, "module-link")) |
104 | else if (!strcmp(name, "module-link")) |
105 | cgit_module_link = xstrdup(value); |
105 | cgit_module_link = xstrdup(value); |
106 | else if (!strcmp(name, "virtual-root")) |
106 | else if (!strcmp(name, "virtual-root")) |
107 | cgit_virtual_root = xstrdup(value); |
107 | cgit_virtual_root = xstrdup(value); |
108 | else if (!strcmp(name, "nocache")) |
108 | else if (!strcmp(name, "nocache")) |
109 | cgit_nocache = atoi(value); |
109 | cgit_nocache = atoi(value); |
110 | else if (!strcmp(name, "snapshots")) |
110 | else if (!strcmp(name, "snapshots")) |
111 | cgit_snapshots = atoi(value); |
111 | cgit_snapshots = atoi(value); |
112 | else if (!strcmp(name, "cache-root")) |
112 | else if (!strcmp(name, "cache-root")) |
113 | cgit_cache_root = xstrdup(value); |
113 | cgit_cache_root = xstrdup(value); |
114 | else if (!strcmp(name, "cache-root-ttl")) |
114 | else if (!strcmp(name, "cache-root-ttl")) |
115 | cgit_cache_root_ttl = atoi(value); |
115 | cgit_cache_root_ttl = atoi(value); |
116 | else if (!strcmp(name, "cache-repo-ttl")) |
116 | else if (!strcmp(name, "cache-repo-ttl")) |
117 | cgit_cache_repo_ttl = atoi(value); |
117 | cgit_cache_repo_ttl = atoi(value); |
118 | else if (!strcmp(name, "cache-static-ttl")) |
118 | else if (!strcmp(name, "cache-static-ttl")) |
119 | cgit_cache_static_ttl = atoi(value); |
119 | cgit_cache_static_ttl = atoi(value); |
120 | else if (!strcmp(name, "cache-dynamic-ttl")) |
120 | else if (!strcmp(name, "cache-dynamic-ttl")) |
121 | cgit_cache_dynamic_ttl = atoi(value); |
121 | cgit_cache_dynamic_ttl = atoi(value); |
122 | else if (!strcmp(name, "max-message-length")) |
122 | else if (!strcmp(name, "max-message-length")) |
123 | cgit_max_msg_len = atoi(value); |
123 | cgit_max_msg_len = atoi(value); |
124 | else if (!strcmp(name, "max-commit-count")) |
124 | else if (!strcmp(name, "max-commit-count")) |
125 | cgit_max_commit_count = atoi(value); |
125 | cgit_max_commit_count = atoi(value); |
126 | else if (!strcmp(name, "repo.url")) |
126 | else if (!strcmp(name, "repo.url")) |
127 | cgit_repo = add_repo(value); |
127 | cgit_repo = add_repo(value); |
128 | else if (!strcmp(name, "repo.name")) |
128 | else if (!strcmp(name, "repo.name")) |
129 | cgit_repo->name = xstrdup(value); |
129 | cgit_repo->name = xstrdup(value); |
130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
131 | cgit_repo->path = xstrdup(value); |
131 | cgit_repo->path = xstrdup(value); |
132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
133 | cgit_repo->desc = xstrdup(value); |
133 | cgit_repo->desc = xstrdup(value); |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
135 | cgit_repo->owner = xstrdup(value); |
135 | cgit_repo->owner = xstrdup(value); |
136 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
136 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
137 | cgit_repo->snapshots = atoi(value); |
137 | cgit_repo->snapshots = atoi(value); |
138 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
138 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
139 | cgit_repo->module_link= xstrdup(value); |
139 | cgit_repo->module_link= xstrdup(value); |
140 | else if (!strcmp(name, "include")) |
140 | else if (!strcmp(name, "include")) |
141 | cgit_read_config(value, cgit_global_config_cb); |
141 | cgit_read_config(value, cgit_global_config_cb); |
142 | } |
142 | } |
143 | |
143 | |
144 | void cgit_repo_config_cb(const char *name, const char *value) |
144 | void cgit_repo_config_cb(const char *name, const char *value) |
145 | { |
145 | { |
146 | if (!strcmp(name, "name")) |
146 | if (!strcmp(name, "name")) |
147 | cgit_repo_name = xstrdup(value); |
147 | cgit_repo_name = xstrdup(value); |
148 | else if (!strcmp(name, "desc")) |
148 | else if (!strcmp(name, "desc")) |
149 | cgit_repo_desc = xstrdup(value); |
149 | cgit_repo_desc = xstrdup(value); |
150 | else if (!strcmp(name, "owner")) |
150 | else if (!strcmp(name, "owner")) |
151 | cgit_repo_owner = xstrdup(value); |
151 | cgit_repo_owner = xstrdup(value); |
152 | } |
152 | } |
153 | |
153 | |
154 | void cgit_querystring_cb(const char *name, const char *value) |
154 | void cgit_querystring_cb(const char *name, const char *value) |
155 | { |
155 | { |
156 | if (!strcmp(name,"r")) { |
156 | if (!strcmp(name,"r")) { |
157 | cgit_query_repo = xstrdup(value); |
157 | cgit_query_repo = xstrdup(value); |
158 | } else if (!strcmp(name, "p")) { |
158 | } else if (!strcmp(name, "p")) { |
159 | cgit_query_page = xstrdup(value); |
159 | cgit_query_page = xstrdup(value); |
160 | } else if (!strcmp(name, "q")) { |
160 | } else if (!strcmp(name, "q")) { |
161 | cgit_query_search = xstrdup(value); |
161 | cgit_query_search = xstrdup(value); |
162 | } else if (!strcmp(name, "h")) { |
162 | } else if (!strcmp(name, "h")) { |
163 | cgit_query_head = xstrdup(value); |
163 | cgit_query_head = xstrdup(value); |
164 | cgit_query_has_symref = 1; |
164 | cgit_query_has_symref = 1; |
165 | } else if (!strcmp(name, "id")) { |
165 | } else if (!strcmp(name, "id")) { |
166 | cgit_query_sha1 = xstrdup(value); |
166 | cgit_query_sha1 = xstrdup(value); |
167 | cgit_query_has_sha1 = 1; |
167 | cgit_query_has_sha1 = 1; |
168 | } else if (!strcmp(name, "id2")) { |
168 | } else if (!strcmp(name, "id2")) { |
169 | cgit_query_sha2 = xstrdup(value); |
169 | cgit_query_sha2 = xstrdup(value); |
170 | cgit_query_has_sha1 = 1; |
170 | cgit_query_has_sha1 = 1; |
171 | } else if (!strcmp(name, "ofs")) { |
171 | } else if (!strcmp(name, "ofs")) { |
172 | cgit_query_ofs = atoi(value); |
172 | cgit_query_ofs = atoi(value); |
173 | } else if (!strcmp(name, "path")) { |
173 | } else if (!strcmp(name, "path")) { |
174 | cgit_query_path = xstrdup(value); |
174 | cgit_query_path = xstrdup(value); |
175 | } else if (!strcmp(name, "name")) { |
175 | } else if (!strcmp(name, "name")) { |
176 | cgit_query_name = xstrdup(value); |
176 | cgit_query_name = xstrdup(value); |
177 | } |
177 | } |
178 | } |
178 | } |
179 | |
179 | |
180 | void *cgit_free_commitinfo(struct commitinfo *info) |
180 | void *cgit_free_commitinfo(struct commitinfo *info) |
181 | { |
181 | { |
182 | free(info->author); |
182 | free(info->author); |
183 | free(info->author_email); |
183 | free(info->author_email); |
184 | free(info->committer); |
184 | free(info->committer); |
185 | free(info->committer_email); |
185 | free(info->committer_email); |
186 | free(info->subject); |
186 | free(info->subject); |
187 | free(info); |
187 | free(info); |
188 | return NULL; |
188 | return NULL; |
189 | } |
189 | } |
190 | |
190 | |
191 | int hextoint(char c) |
191 | int hextoint(char c) |
192 | { |
192 | { |
193 | if (c >= 'a' && c <= 'f') |
193 | if (c >= 'a' && c <= 'f') |
194 | return 10 + c - 'a'; |
194 | return 10 + c - 'a'; |
195 | else if (c >= 'A' && c <= 'F') |
195 | else if (c >= 'A' && c <= 'F') |
196 | return 10 + c - 'A'; |
196 | return 10 + c - 'A'; |
197 | else if (c >= '0' && c <= '9') |
197 | else if (c >= '0' && c <= '9') |
198 | return c - '0'; |
198 | return c - '0'; |
199 | else |
199 | else |
200 | return -1; |
200 | return -1; |
201 | } |
201 | } |
202 | |
202 | |
203 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
203 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
204 | struct diff_options *options, void *data) |
204 | struct diff_options *options, void *data) |
205 | { |
205 | { |
206 | int i; |
206 | int i; |
207 | |
207 | |
208 | for (i = 0; i < q->nr; i++) { |
208 | for (i = 0; i < q->nr; i++) { |
209 | if (q->queue[i]->status == 'U') |
209 | if (q->queue[i]->status == 'U') |
210 | continue; |
210 | continue; |
211 | ((filepair_fn)data)(q->queue[i]); |
211 | ((filepair_fn)data)(q->queue[i]); |
212 | } |
212 | } |
213 | } |
213 | } |
214 | |
214 | |
215 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
215 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
216 | { |
216 | { |
217 | enum object_type type; |
217 | enum object_type type; |
218 | |
218 | |
219 | if (is_null_sha1(sha1)) { |
219 | if (is_null_sha1(sha1)) { |
220 | file->ptr = (char *)""; |
220 | file->ptr = (char *)""; |
221 | file->size = 0; |
221 | file->size = 0; |
222 | } else { |
222 | } else { |
223 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
223 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
224 | } |
224 | } |
225 | return 1; |
225 | return 1; |
226 | } |
226 | } |
227 | |
227 | |
228 | /* |
228 | /* |
229 | * Receive diff-buffers from xdiff and concatenate them as |
229 | * Receive diff-buffers from xdiff and concatenate them as |
230 | * needed across multiple callbacks. |
230 | * needed across multiple callbacks. |
231 | * |
231 | * |
232 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
232 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
233 | * ripped from git and modified to use globals instead of |
233 | * ripped from git and modified to use globals instead of |
234 | * a special callback-struct. |
234 | * a special callback-struct. |
235 | */ |
235 | */ |
236 | char *diffbuf = NULL; |
236 | char *diffbuf = NULL; |
237 | int buflen = 0; |
237 | int buflen = 0; |
238 | |
238 | |
239 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
239 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
240 | { |
240 | { |
241 | int i; |
241 | int i; |
242 | |
242 | |
243 | for (i = 0; i < nbuf; i++) { |
243 | for (i = 0; i < nbuf; i++) { |
244 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
244 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
245 | /* Incomplete line */ |
245 | /* Incomplete line */ |
246 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
246 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
247 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
247 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
248 | buflen += mb[i].size; |
248 | buflen += mb[i].size; |
249 | continue; |
249 | continue; |
250 | } |
250 | } |
251 | |
251 | |
252 | /* we have a complete line */ |
252 | /* we have a complete line */ |
253 | if (!diffbuf) { |
253 | if (!diffbuf) { |
254 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
254 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
255 | continue; |
255 | continue; |
256 | } |
256 | } |
257 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
257 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
258 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
258 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
259 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
259 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
260 | free(diffbuf); |
260 | free(diffbuf); |
261 | diffbuf = NULL; |
261 | diffbuf = NULL; |
262 | buflen = 0; |
262 | buflen = 0; |
263 | } |
263 | } |
264 | if (diffbuf) { |
264 | if (diffbuf) { |
265 | ((linediff_fn)priv)(diffbuf, buflen); |
265 | ((linediff_fn)priv)(diffbuf, buflen); |
266 | free(diffbuf); |
266 | free(diffbuf); |
267 | diffbuf = NULL; |
267 | diffbuf = NULL; |
268 | buflen = 0; |
268 | buflen = 0; |
269 | } |
269 | } |
270 | return 0; |
270 | return 0; |
271 | } |
271 | } |
272 | |
272 | |
273 | int cgit_diff_files(const unsigned char *old_sha1, |
273 | int cgit_diff_files(const unsigned char *old_sha1, |
274 | const unsigned char *new_sha1, |
274 | const unsigned char *new_sha1, |
275 | linediff_fn fn) |
275 | linediff_fn fn) |
276 | { |
276 | { |
277 | mmfile_t file1, file2; |
277 | mmfile_t file1, file2; |
278 | xpparam_t diff_params; |
278 | xpparam_t diff_params; |
279 | xdemitconf_t emit_params; |
279 | xdemitconf_t emit_params; |
280 | xdemitcb_t emit_cb; |
280 | xdemitcb_t emit_cb; |
281 | |
281 | |
282 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
282 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
283 | return 1; |
283 | return 1; |
284 | |
284 | |
285 | diff_params.flags = XDF_NEED_MINIMAL; |
285 | diff_params.flags = XDF_NEED_MINIMAL; |
286 | emit_params.ctxlen = 3; |
286 | emit_params.ctxlen = 3; |
287 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
287 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
288 | emit_cb.outf = filediff_cb; |
288 | emit_cb.outf = filediff_cb; |
289 | emit_cb.priv = fn; |
289 | emit_cb.priv = fn; |
290 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
290 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
291 | return 0; |
291 | return 0; |
292 | } |
292 | } |
293 | |
293 | |
294 | void cgit_diff_tree(const unsigned char *old_sha1, |
294 | void cgit_diff_tree(const unsigned char *old_sha1, |
295 | const unsigned char *new_sha1, |
295 | const unsigned char *new_sha1, |
296 | filepair_fn fn) |
296 | filepair_fn fn) |
297 | { |
297 | { |
298 | struct diff_options opt; |
298 | struct diff_options opt; |
299 | int ret; |
299 | int ret; |
300 | |
300 | |
301 | diff_setup(&opt); |
301 | diff_setup(&opt); |
302 | opt.output_format = DIFF_FORMAT_CALLBACK; |
302 | opt.output_format = DIFF_FORMAT_CALLBACK; |
303 | opt.detect_rename = 1; |
303 | opt.detect_rename = 1; |
304 | opt.recursive = 1; |
304 | opt.recursive = 1; |
305 | opt.format_callback = cgit_diff_tree_cb; |
305 | opt.format_callback = cgit_diff_tree_cb; |
306 | opt.format_callback_data = fn; |
306 | opt.format_callback_data = fn; |
307 | diff_setup_done(&opt); |
307 | diff_setup_done(&opt); |
308 | |
308 | |
309 | if (old_sha1) |
309 | if (old_sha1) |
310 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
310 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
311 | else |
311 | else |
312 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
312 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
313 | diffcore_std(&opt); |
313 | diffcore_std(&opt); |
314 | diff_flush(&opt); |
314 | diff_flush(&opt); |
315 | } |
315 | } |
316 | |
316 | |
317 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
317 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
318 | { |
318 | { |
319 | unsigned char *old_sha1 = NULL; |
319 | unsigned char *old_sha1 = NULL; |
320 | |
320 | |
321 | if (commit->parents) |
321 | if (commit->parents) |
322 | old_sha1 = commit->parents->item->object.sha1; |
322 | old_sha1 = commit->parents->item->object.sha1; |
323 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
323 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
324 | } |
324 | } |
|