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