|
diff --git a/shared.c b/shared.c index 0fe513f..0a6a5ed 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -25,32 +25,33 @@ char *cgit_virtual_root = NULL; |
25 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
25 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
26 | char *cgit_cache_root = CGIT_CACHE_ROOT; |
26 | char *cgit_cache_root = CGIT_CACHE_ROOT; |
27 | char *cgit_repo_group = NULL; |
27 | char *cgit_repo_group = NULL; |
28 | |
28 | |
29 | int cgit_nocache = 0; |
29 | int cgit_nocache = 0; |
30 | int cgit_snapshots = 0; |
30 | int cgit_snapshots = 0; |
31 | int cgit_enable_index_links = 0; |
31 | int cgit_enable_index_links = 0; |
32 | int cgit_enable_log_filecount = 0; |
32 | int cgit_enable_log_filecount = 0; |
33 | int cgit_enable_log_linecount = 0; |
33 | int cgit_enable_log_linecount = 0; |
34 | int cgit_max_lock_attempts = 5; |
34 | int cgit_max_lock_attempts = 5; |
35 | int cgit_cache_root_ttl = 5; |
35 | int cgit_cache_root_ttl = 5; |
36 | int cgit_cache_repo_ttl = 5; |
36 | int cgit_cache_repo_ttl = 5; |
37 | int cgit_cache_dynamic_ttl = 5; |
37 | int cgit_cache_dynamic_ttl = 5; |
38 | int cgit_cache_static_ttl = -1; |
38 | int cgit_cache_static_ttl = -1; |
39 | int cgit_cache_max_create_time = 5; |
39 | int cgit_cache_max_create_time = 5; |
40 | int cgit_summary_log = 0; |
40 | int cgit_summary_log = 0; |
| |
41 | int cgit_renamelimit = -1; |
41 | |
42 | |
42 | int cgit_max_msg_len = 60; |
43 | int cgit_max_msg_len = 60; |
43 | int cgit_max_repodesc_len = 60; |
44 | int cgit_max_repodesc_len = 60; |
44 | int cgit_max_commit_count = 50; |
45 | int cgit_max_commit_count = 50; |
45 | |
46 | |
46 | int cgit_query_has_symref = 0; |
47 | int cgit_query_has_symref = 0; |
47 | int cgit_query_has_sha1 = 0; |
48 | int cgit_query_has_sha1 = 0; |
48 | |
49 | |
49 | char *cgit_querystring = NULL; |
50 | char *cgit_querystring = NULL; |
50 | char *cgit_query_repo = NULL; |
51 | char *cgit_query_repo = NULL; |
51 | char *cgit_query_page = NULL; |
52 | char *cgit_query_page = NULL; |
52 | char *cgit_query_head = NULL; |
53 | char *cgit_query_head = NULL; |
53 | char *cgit_query_search = NULL; |
54 | char *cgit_query_search = NULL; |
54 | char *cgit_query_sha1 = NULL; |
55 | char *cgit_query_sha1 = NULL; |
55 | char *cgit_query_sha2 = NULL; |
56 | char *cgit_query_sha2 = NULL; |
56 | char *cgit_query_path = NULL; |
57 | char *cgit_query_path = NULL; |
@@ -169,32 +170,34 @@ void cgit_global_config_cb(const char *name, const char *value) |
169 | else if (!strcmp(name, "cache-repo-ttl")) |
170 | else if (!strcmp(name, "cache-repo-ttl")) |
170 | cgit_cache_repo_ttl = atoi(value); |
171 | cgit_cache_repo_ttl = atoi(value); |
171 | else if (!strcmp(name, "cache-static-ttl")) |
172 | else if (!strcmp(name, "cache-static-ttl")) |
172 | cgit_cache_static_ttl = atoi(value); |
173 | cgit_cache_static_ttl = atoi(value); |
173 | else if (!strcmp(name, "cache-dynamic-ttl")) |
174 | else if (!strcmp(name, "cache-dynamic-ttl")) |
174 | cgit_cache_dynamic_ttl = atoi(value); |
175 | cgit_cache_dynamic_ttl = atoi(value); |
175 | else if (!strcmp(name, "max-message-length")) |
176 | else if (!strcmp(name, "max-message-length")) |
176 | cgit_max_msg_len = atoi(value); |
177 | cgit_max_msg_len = atoi(value); |
177 | else if (!strcmp(name, "max-repodesc-length")) |
178 | else if (!strcmp(name, "max-repodesc-length")) |
178 | cgit_max_repodesc_len = atoi(value); |
179 | cgit_max_repodesc_len = atoi(value); |
179 | else if (!strcmp(name, "max-commit-count")) |
180 | else if (!strcmp(name, "max-commit-count")) |
180 | cgit_max_commit_count = atoi(value); |
181 | cgit_max_commit_count = atoi(value); |
181 | else if (!strcmp(name, "summary-log")) |
182 | else if (!strcmp(name, "summary-log")) |
182 | cgit_summary_log = atoi(value); |
183 | cgit_summary_log = atoi(value); |
183 | else if (!strcmp(name, "agefile")) |
184 | else if (!strcmp(name, "agefile")) |
184 | cgit_agefile = xstrdup(value); |
185 | cgit_agefile = xstrdup(value); |
| |
186 | else if (!strcmp(name, "renamelimit")) |
| |
187 | cgit_renamelimit = atoi(value); |
185 | else if (!strcmp(name, "repo.group")) |
188 | else if (!strcmp(name, "repo.group")) |
186 | cgit_repo_group = xstrdup(value); |
189 | cgit_repo_group = xstrdup(value); |
187 | else if (!strcmp(name, "repo.url")) |
190 | else if (!strcmp(name, "repo.url")) |
188 | cgit_repo = add_repo(value); |
191 | cgit_repo = add_repo(value); |
189 | else if (!strcmp(name, "repo.name")) |
192 | else if (!strcmp(name, "repo.name")) |
190 | cgit_repo->name = xstrdup(value); |
193 | cgit_repo->name = xstrdup(value); |
191 | else if (cgit_repo && !strcmp(name, "repo.path")) |
194 | else if (cgit_repo && !strcmp(name, "repo.path")) |
192 | cgit_repo->path = trim_end(value, '/'); |
195 | cgit_repo->path = trim_end(value, '/'); |
193 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
196 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
194 | cgit_repo->desc = xstrdup(value); |
197 | cgit_repo->desc = xstrdup(value); |
195 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
198 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
196 | cgit_repo->owner = xstrdup(value); |
199 | cgit_repo->owner = xstrdup(value); |
197 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
200 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
198 | cgit_repo->defbranch = xstrdup(value); |
201 | cgit_repo->defbranch = xstrdup(value); |
199 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
202 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
200 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
203 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
@@ -378,32 +381,33 @@ int cgit_diff_files(const unsigned char *old_sha1, |
378 | emit_cb.outf = filediff_cb; |
381 | emit_cb.outf = filediff_cb; |
379 | emit_cb.priv = fn; |
382 | emit_cb.priv = fn; |
380 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
383 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
381 | return 0; |
384 | return 0; |
382 | } |
385 | } |
383 | |
386 | |
384 | void cgit_diff_tree(const unsigned char *old_sha1, |
387 | void cgit_diff_tree(const unsigned char *old_sha1, |
385 | const unsigned char *new_sha1, |
388 | const unsigned char *new_sha1, |
386 | filepair_fn fn) |
389 | filepair_fn fn) |
387 | { |
390 | { |
388 | struct diff_options opt; |
391 | struct diff_options opt; |
389 | int ret; |
392 | int ret; |
390 | |
393 | |
391 | diff_setup(&opt); |
394 | diff_setup(&opt); |
392 | opt.output_format = DIFF_FORMAT_CALLBACK; |
395 | opt.output_format = DIFF_FORMAT_CALLBACK; |
393 | opt.detect_rename = 1; |
396 | opt.detect_rename = 1; |
| |
397 | opt.rename_limit = cgit_renamelimit; |
394 | opt.recursive = 1; |
398 | opt.recursive = 1; |
395 | opt.format_callback = cgit_diff_tree_cb; |
399 | opt.format_callback = cgit_diff_tree_cb; |
396 | opt.format_callback_data = fn; |
400 | opt.format_callback_data = fn; |
397 | diff_setup_done(&opt); |
401 | diff_setup_done(&opt); |
398 | |
402 | |
399 | if (old_sha1 && !is_null_sha1(old_sha1)) |
403 | if (old_sha1 && !is_null_sha1(old_sha1)) |
400 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
404 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
401 | else |
405 | else |
402 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
406 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
403 | diffcore_std(&opt); |
407 | diffcore_std(&opt); |
404 | diff_flush(&opt); |
408 | diff_flush(&opt); |
405 | } |
409 | } |
406 | |
410 | |
407 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
411 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
408 | { |
412 | { |
409 | unsigned char *old_sha1 = NULL; |
413 | unsigned char *old_sha1 = NULL; |
|