-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.css | 11 | ||||
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | cgitrc | 7 | ||||
-rwxr-xr-x | gen-version.sh | 2 | ||||
-rw-r--r-- | shared.c | 15 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-diff.c | 45 |
8 files changed, 59 insertions, 31 deletions
@@ -108,5 +108,5 @@ static void cgit_print_repo_page(struct cacheitem *item) break; case CMD_DIFF: - cgit_print_diff(cgit_query_sha1, cgit_query_sha2); + cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); break; default: @@ -273,8 +273,4 @@ table.diffstat { } -table.diffstat tr:hover { - background-color: #ccc; -} - table.diffstat th { font-weight: normal; @@ -340,4 +336,8 @@ div.diffstat-summary { } +table.diff { + width: 100%; +} + table.diff td { font-family: monospace; @@ -347,5 +347,6 @@ table.diff td { table.diff td div.head { font-weight: bold; - padding-top: 1em; + margin-top: 1em; + background-color: #eee; } @@ -171,5 +171,5 @@ extern int cgit_diff_files(const unsigned char *old_sha1, extern void cgit_diff_tree(const unsigned char *old_sha1, const unsigned char *new_sha1, - filepair_fn fn); + filepair_fn fn, const char *prefix); extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); @@ -239,5 +239,5 @@ extern void cgit_print_tree(const char *rev, char *path); extern void cgit_print_commit(char *hex); extern void cgit_print_tag(char *revname); -extern void cgit_print_diff(const char *new_hex, const char *old_hex); +extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); extern void cgit_print_snapshot(struct cacheitem *item, const char *head, const char *hex, const char *prefix, @@ -42,4 +42,11 @@ +## Git detects renames, but with a limit on the number of files to +## consider. This option can be used to specify another limit (or -1 to +## use the default limit). +## +#renamelimit=-1 + + ## Specify a root for virtual urls. This makes cgit generate urls like ## diff --git a/gen-version.sh b/gen-version.sh index 739c83e..3a08015 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -7,5 +7,5 @@ V=$1 if test -d .git then - V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') + V=$(git describe --abbrev=4 HEAD 2>/dev/null) fi @@ -39,4 +39,5 @@ int cgit_cache_static_ttl = -1; int cgit_cache_max_create_time = 5; int cgit_summary_log = 0; +int cgit_renamelimit = -1; int cgit_max_msg_len = 60; @@ -183,4 +184,6 @@ void cgit_global_config_cb(const char *name, const char *value) else if (!strcmp(name, "agefile")) cgit_agefile = xstrdup(value); + else if (!strcmp(name, "renamelimit")) + cgit_renamelimit = atoi(value); else if (!strcmp(name, "repo.group")) cgit_repo_group = xstrdup(value); @@ -384,15 +387,23 @@ int cgit_diff_files(const unsigned char *old_sha1, void cgit_diff_tree(const unsigned char *old_sha1, const unsigned char *new_sha1, - filepair_fn fn) + filepair_fn fn, const char *prefix) { struct diff_options opt; int ret; + int prefixlen; diff_setup(&opt); opt.output_format = DIFF_FORMAT_CALLBACK; opt.detect_rename = 1; + opt.rename_limit = cgit_renamelimit; opt.recursive = 1; opt.format_callback = cgit_diff_tree_cb; opt.format_callback_data = fn; + if (prefix) { + opt.nr_paths = 1; + opt.paths = &prefix; + prefixlen = strlen(prefix); + opt.pathlens = &prefixlen; + } diff_setup_done(&opt); @@ -411,4 +422,4 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) if (commit->parents) old_sha1 = commit->parents->item->object.sha1; - cgit_diff_tree(old_sha1, commit->object.sha1, fn); + cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); } diff --git a/ui-commit.c b/ui-commit.c index 90e09ed..4ac8955 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -76,6 +76,6 @@ void print_fileinfo(struct fileinfo *info) } htmlf("</td><td class='%s'>", class); - cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, - info->new_path); + cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, + NULL, info->new_path); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) htmlf(" (%s from %s)", @@ -10,4 +10,7 @@ +unsigned char old_rev_sha1[20]; +unsigned char new_rev_sha1[20]; + /* * print a single line returned from xdiff @@ -68,7 +71,15 @@ static void header(unsigned char *sha1, char *path1, int mode1, } html("<br/>--- a/"); - html_txt(path1); + if (mode1 != 0) + cgit_tree_link(path1, NULL, NULL, cgit_query_head, + sha1_to_hex(old_rev_sha1), path1); + else + html_txt(path1); html("<br/>+++ b/"); - html_txt(path2); + if (mode2 != 0) + cgit_tree_link(path2, NULL, NULL, cgit_query_head, + sha1_to_hex(new_rev_sha1), path2); + else + html_txt(path2); } html("</div>"); @@ -90,7 +101,6 @@ static void filepair_cb(struct diff_filepair *pair) } -void cgit_print_diff(const char *new_rev, const char *old_rev) +void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) { - unsigned char sha1[20], sha2[20]; enum object_type type; unsigned long size; @@ -99,6 +109,6 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) if (!new_rev) new_rev = cgit_query_head; - get_sha1(new_rev, sha1); - type = sha1_object_info(sha1, &size); + get_sha1(new_rev, new_rev_sha1); + type = sha1_object_info(new_rev_sha1, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object name: %s", new_rev)); @@ -111,29 +121,28 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(new_rev_sha1); if (!commit || parse_commit(commit)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); if (old_rev) - get_sha1(old_rev, sha2); + get_sha1(old_rev, old_rev_sha1); else if (commit->parents && commit->parents->item) - hashcpy(sha2, commit->parents->item->object.sha1); + hashcpy(old_rev_sha1, commit->parents->item->object.sha1); else - hashclr(sha2); + hashclr(old_rev_sha1); - if (!is_null_sha1(sha2)) { - type = sha1_object_info(sha2, &size); + if (!is_null_sha1(old_rev_sha1)) { + type = sha1_object_info(old_rev_sha1, &size); if (type == OBJ_BAD) { - cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); + cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); return; } - commit2 = lookup_commit_reference(sha2); + commit2 = lookup_commit_reference(old_rev_sha1); if (!commit2 || parse_commit(commit2)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); } - html("<table class='diff'>"); html("<tr><td>"); - cgit_diff_tree(sha2, sha1, filepair_cb); + cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); html("</td></tr>"); html("</table>"); |