| -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
@@ -109,3 +109,3 @@ static void cgit_print_repo_page(struct cacheitem *item) 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; @@ -274,6 +274,2 @@ table.diffstat { -table.diffstat tr:hover { - background-color: #ccc; -} - table.diffstat th { @@ -341,2 +337,6 @@ div.diffstat-summary { +table.diff { + width: 100%; +} + table.diff td { @@ -348,3 +348,4 @@ table.diff td div.head { font-weight: bold; - padding-top: 1em; + margin-top: 1em; + background-color: #eee; } @@ -172,3 +172,3 @@ extern void cgit_diff_tree(const unsigned char *old_sha1, const unsigned char *new_sha1, - filepair_fn fn); + filepair_fn fn, const char *prefix); @@ -240,3 +240,3 @@ 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, @@ -43,2 +43,9 @@ +## 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 @@ -8,3 +8,3 @@ 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 @@ -40,2 +40,3 @@ int cgit_cache_max_create_time = 5; int cgit_summary_log = 0; +int cgit_renamelimit = -1; @@ -184,2 +185,4 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_agefile = xstrdup(value); + else if (!strcmp(name, "renamelimit")) + cgit_renamelimit = atoi(value); else if (!strcmp(name, "repo.group")) @@ -385,3 +388,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, const unsigned char *new_sha1, - filepair_fn fn) + filepair_fn fn, const char *prefix) { @@ -389,2 +392,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, int ret; + int prefixlen; @@ -393,2 +397,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, opt.detect_rename = 1; + opt.rename_limit = cgit_renamelimit; opt.recursive = 1; @@ -396,2 +401,8 @@ void cgit_diff_tree(const unsigned char *old_sha1, opt.format_callback_data = fn; + if (prefix) { + opt.nr_paths = 1; + opt.paths = &prefix; + prefixlen = strlen(prefix); + opt.pathlens = &prefixlen; + } diff_setup_done(&opt); @@ -412,3 +423,3 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) 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 @@ -77,4 +77,4 @@ 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) @@ -11,2 +11,5 @@ +unsigned char old_rev_sha1[20]; +unsigned char new_rev_sha1[20]; + /* @@ -69,5 +72,13 @@ 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); } @@ -91,5 +102,4 @@ 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; @@ -100,4 +110,4 @@ void cgit_print_diff(const char *new_rev, const char *old_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) { @@ -112,27 +122,26 @@ 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>"); |