| -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, 31 insertions, 59 deletions
@@ -107,7 +107,7 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_tag(cgit_query_sha1); break; case CMD_DIFF: - cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); + cgit_print_diff(cgit_query_sha1, cgit_query_sha2); break; default: cgit_print_error("Invalid request"); @@ -272,6 +272,10 @@ table.diffstat { background-color: #eee; } +table.diffstat tr:hover { + background-color: #ccc; +} + table.diffstat th { font-weight: normal; text-align: left; @@ -335,10 +339,6 @@ div.diffstat-summary { padding-top: 0.5em; } -table.diff { - width: 100%; -} - table.diff td { font-family: monospace; white-space: pre; @@ -346,8 +346,7 @@ table.diff td { table.diff td div.head { font-weight: bold; - margin-top: 1em; - background-color: #eee; + padding-top: 1em; } table.diff td div.hunk { @@ -170,7 +170,7 @@ 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, const char *prefix); + filepair_fn fn); extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); @@ -238,7 +238,7 @@ extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path) 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, const char *prefix); +extern void cgit_print_diff(const char *new_hex, const char *old_hex); extern void cgit_print_snapshot(struct cacheitem *item, const char *head, const char *hex, const char *prefix, const char *filename, int snapshot); @@ -41,13 +41,6 @@ #agefile=info/web/last-modified -## 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 ## ## http://localhost/git/repo/log/?h=branch diff --git a/gen-version.sh b/gen-version.sh index 3a08015..739c83e 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -6,7 +6,7 @@ V=$1 # Use `git describe` to get current version if we're inside a git repo if test -d .git then - V=$(git describe --abbrev=4 HEAD 2>/dev/null) + V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') fi new="CGIT_VERSION = $V" @@ -38,7 +38,6 @@ int cgit_cache_dynamic_ttl = 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; int cgit_max_repodesc_len = 60; @@ -183,8 +182,6 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_summary_log = atoi(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); else if (!strcmp(name, "repo.url")) @@ -386,25 +383,17 @@ 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, const char *prefix) + filepair_fn fn) { 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); if (old_sha1 && !is_null_sha1(old_sha1)) @@ -421,5 +410,5 @@ 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, NULL); + cgit_diff_tree(old_sha1, commit->object.sha1, fn); } diff --git a/ui-commit.c b/ui-commit.c index 4ac8955..90e09ed 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -75,8 +75,8 @@ void print_fileinfo(struct fileinfo *info) html("]</span>"); } htmlf("</td><td class='%s'>", class); - cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, - NULL, info->new_path); + cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, + info->new_path); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) htmlf(" (%s from %s)", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", @@ -9,9 +9,6 @@ #include "cgit.h" -unsigned char old_rev_sha1[20]; -unsigned char new_rev_sha1[20]; - /* * print a single line returned from xdiff */ @@ -70,17 +67,9 @@ static void header(unsigned char *sha1, char *path1, int mode1, htmlf("..%.6o", mode2); } html("<br/>--- a/"); - if (mode1 != 0) - cgit_tree_link(path1, NULL, NULL, cgit_query_head, - sha1_to_hex(old_rev_sha1), path1); - else - html_txt(path1); + html_txt(path1); html("<br/>+++ b/"); - if (mode2 != 0) - cgit_tree_link(path2, NULL, NULL, cgit_query_head, - sha1_to_hex(new_rev_sha1), path2); - else - html_txt(path2); + html_txt(path2); } html("</div>"); } @@ -100,16 +89,17 @@ static void filepair_cb(struct diff_filepair *pair) cgit_print_error("Error running diff"); } -void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) +void cgit_print_diff(const char *new_rev, const char *old_rev) { + unsigned char sha1[20], sha2[20]; enum object_type type; unsigned long size; struct commit *commit, *commit2; if (!new_rev) new_rev = cgit_query_head; - get_sha1(new_rev, new_rev_sha1); - type = sha1_object_info(new_rev_sha1, &size); + get_sha1(new_rev, sha1); + type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object name: %s", new_rev)); return; @@ -120,30 +110,31 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi return; } - commit = lookup_commit_reference(new_rev_sha1); + commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); if (old_rev) - get_sha1(old_rev, old_rev_sha1); + get_sha1(old_rev, sha2); else if (commit->parents && commit->parents->item) - hashcpy(old_rev_sha1, commit->parents->item->object.sha1); + hashcpy(sha2, commit->parents->item->object.sha1); else - hashclr(old_rev_sha1); + hashclr(sha2); - if (!is_null_sha1(old_rev_sha1)) { - type = sha1_object_info(old_rev_sha1, &size); + if (!is_null_sha1(sha2)) { + type = sha1_object_info(sha2, &size); if (type == OBJ_BAD) { - cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); + cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); return; } - commit2 = lookup_commit_reference(old_rev_sha1); + commit2 = lookup_commit_reference(sha2); if (!commit2 || parse_commit(commit2)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); } + html("<table class='diff'>"); html("<tr><td>"); - cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); + cgit_diff_tree(sha2, sha1, filepair_cb); html("</td></tr>"); html("</table>"); } |