|
diff --git a/shared.c b/shared.c index 0fe513f..3d4feea 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -35,12 +35,13 @@ 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; |
@@ -179,12 +180,14 @@ void cgit_global_config_cb(const char *name, const char *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); |
@@ -380,23 +383,31 @@ int cgit_diff_files(const unsigned char *old_sha1, |
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, const char *prefix) |
387 | { |
390 | { |
388 | struct diff_options opt; |
391 | struct diff_options opt; |
389 | int ret; |
392 | int ret; |
| |
393 | int prefixlen; |
390 | |
394 | |
391 | diff_setup(&opt); |
395 | diff_setup(&opt); |
392 | opt.output_format = DIFF_FORMAT_CALLBACK; |
396 | opt.output_format = DIFF_FORMAT_CALLBACK; |
393 | opt.detect_rename = 1; |
397 | opt.detect_rename = 1; |
| |
398 | opt.rename_limit = cgit_renamelimit; |
394 | opt.recursive = 1; |
399 | opt.recursive = 1; |
395 | opt.format_callback = cgit_diff_tree_cb; |
400 | opt.format_callback = cgit_diff_tree_cb; |
396 | opt.format_callback_data = fn; |
401 | opt.format_callback_data = fn; |
| |
402 | if (prefix) { |
| |
403 | opt.nr_paths = 1; |
| |
404 | opt.paths = &prefix; |
| |
405 | prefixlen = strlen(prefix); |
| |
406 | opt.pathlens = &prefixlen; |
| |
407 | } |
397 | diff_setup_done(&opt); |
408 | diff_setup_done(&opt); |
398 | |
409 | |
399 | if (old_sha1 && !is_null_sha1(old_sha1)) |
410 | if (old_sha1 && !is_null_sha1(old_sha1)) |
400 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
411 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
401 | else |
412 | else |
402 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
413 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
@@ -407,8 +418,8 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
407 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
418 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
408 | { |
419 | { |
409 | unsigned char *old_sha1 = NULL; |
420 | unsigned char *old_sha1 = NULL; |
410 | |
421 | |
411 | if (commit->parents) |
422 | if (commit->parents) |
412 | old_sha1 = commit->parents->item->object.sha1; |
423 | old_sha1 = commit->parents->item->object.sha1; |
413 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
424 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
414 | } |
425 | } |
|