|
diff --git a/shared.c b/shared.c index f5875e4..a764c4d 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -51,24 +51,25 @@ struct cgit_repo *cgit_add_repo(const char *url) |
51 | ret->url = trim_end(url, '/'); |
51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; |
52 | ret->name = ret->url; |
53 | ret->path = NULL; |
53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; |
54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; |
55 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; |
56 | ret->group = ctx.cfg.repo_group; |
57 | ret->defbranch = "master"; |
57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; |
58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->module_link = ctx.cfg.module_link; |
61 | ret->module_link = ctx.cfg.module_link; |
62 | ret->readme = NULL; |
62 | ret->readme = NULL; |
| |
63 | ret->mtime = -1; |
63 | return ret; |
64 | return ret; |
64 | } |
65 | } |
65 | |
66 | |
66 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | { |
68 | { |
68 | int i; |
69 | int i; |
69 | struct cgit_repo *repo; |
70 | struct cgit_repo *repo; |
70 | |
71 | |
71 | for (i=0; i<cgit_repolist.count; i++) { |
72 | for (i=0; i<cgit_repolist.count; i++) { |
72 | repo = &cgit_repolist.repos[i]; |
73 | repo = &cgit_repolist.repos[i]; |
73 | if (!strcmp(repo->url, url)) |
74 | if (!strcmp(repo->url, url)) |
74 | return repo; |
75 | return repo; |
@@ -257,28 +258,30 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
257 | int cgit_diff_files(const unsigned char *old_sha1, |
258 | int cgit_diff_files(const unsigned char *old_sha1, |
258 | const unsigned char *new_sha1, |
259 | const unsigned char *new_sha1, |
259 | linediff_fn fn) |
260 | linediff_fn fn) |
260 | { |
261 | { |
261 | mmfile_t file1, file2; |
262 | mmfile_t file1, file2; |
262 | xpparam_t diff_params; |
263 | xpparam_t diff_params; |
263 | xdemitconf_t emit_params; |
264 | xdemitconf_t emit_params; |
264 | xdemitcb_t emit_cb; |
265 | xdemitcb_t emit_cb; |
265 | |
266 | |
266 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | return 1; |
268 | return 1; |
268 | |
269 | |
| |
270 | memset(&diff_params, 0, sizeof(diff_params)); |
| |
271 | memset(&emit_params, 0, sizeof(emit_params)); |
| |
272 | memset(&emit_cb, 0, sizeof(emit_cb)); |
269 | diff_params.flags = XDF_NEED_MINIMAL; |
273 | diff_params.flags = XDF_NEED_MINIMAL; |
270 | emit_params.ctxlen = 3; |
274 | emit_params.ctxlen = 3; |
271 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
275 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
272 | emit_params.find_func = NULL; |
| |
273 | emit_cb.outf = filediff_cb; |
276 | emit_cb.outf = filediff_cb; |
274 | emit_cb.priv = fn; |
277 | emit_cb.priv = fn; |
275 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
278 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
276 | return 0; |
279 | return 0; |
277 | } |
280 | } |
278 | |
281 | |
279 | void cgit_diff_tree(const unsigned char *old_sha1, |
282 | void cgit_diff_tree(const unsigned char *old_sha1, |
280 | const unsigned char *new_sha1, |
283 | const unsigned char *new_sha1, |
281 | filepair_fn fn, const char *prefix) |
284 | filepair_fn fn, const char *prefix) |
282 | { |
285 | { |
283 | struct diff_options opt; |
286 | struct diff_options opt; |
284 | int ret; |
287 | int ret; |
|