| -rw-r--r-- | ui-commit.c | 8 | ||||
| -rw-r--r-- | ui-log.c | 4 | ||||
| -rw-r--r-- | ui-shared.c | 4 | ||||
| -rw-r--r-- | ui-summary.c | 2 | ||||
| -rw-r--r-- | ui-tree.c | 6 | ||||
| -rw-r--r-- | ui-view.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/ui-commit.c b/ui-commit.c index 6b135aa..1d12bbb 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -46,65 +46,65 @@ void print_fileinfo(struct fileinfo *info) case DIFF_STATUS_RENAMED: class = "mov"; break; case DIFF_STATUS_TYPE_CHANGED: class = "typ"; break; case DIFF_STATUS_UNKNOWN: class = "unk"; break; case DIFF_STATUS_UNMERGED: class = "stg"; break; default: die("bug: unhandled diff status %c", info->status); } html("<tr>"); htmlf("<td class='mode'>"); if (is_null_sha1(info->new_sha1)) { html_filemode(info->old_mode); } else { html_filemode(info->new_mode); } if (info->old_mode != info->new_mode && !is_null_sha1(info->old_sha1) && !is_null_sha1(info->new_sha1)) { html("<span class='modechange'>["); html_filemode(info->old_mode); html("]</span>"); } htmlf("</td><td class='%s'>", class); - query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), + query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), sha1_to_hex(info->new_sha1), info->new_path); html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { html_txt(info->new_path); htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), NULL, NULL); html_txt(info->old_path); html("</a>)"); } else { html_txt(info->new_path); html("</a>"); } html("</td><td class='right'>"); htmlf("%d", info->added + info->removed); html("</td><td class='graph'>"); htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); htmlf("<td class='add' style='width: %.1f%%;'/>", info->added * 100.0 / max_changes); htmlf("<td class='rem' style='width: %.1f%%;'/>", info->removed * 100.0 / max_changes); htmlf("<td class='none' style='width: %.1f%%;'/>", (max_changes - info->removed - info->added) * 100.0 / max_changes); html("</tr></table></td></tr>\n"); } void cgit_count_diff_lines(char *line, int len) { @@ -153,88 +153,88 @@ void cgit_print_commit(const char *hex) unsigned char sha1[20]; char *query; char *filename; int i; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; } commit = lookup_commit_reference(sha1); if (!commit) { cgit_print_error(fmt("Bad commit reference: %s", hex)); return; } info = cgit_parse_commit(commit); html("<table class='commit-info'>\n"); html("<tr><th>author</th><td>"); html_txt(info->author); html(" "); html_txt(info->author_email); html("</td><td class='right'>"); cgit_print_date(info->author_date, FMT_LONGDATE); html("</td></tr>\n"); html("<tr><th>committer</th><td>"); html_txt(info->committer); html(" "); html_txt(info->committer_email); html("</td><td class='right'>"); cgit_print_date(info->committer_date, FMT_LONGDATE); html("</td></tr>\n"); html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); - query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), + query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), sha1_to_hex(commit->tree->object.sha1)); html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); for (p = commit->parents; p ; p = p->next) { parent = lookup_commit_reference(p->item->object.sha1); if (!parent) { html("<tr><td colspan='3'>"); cgit_print_error("Error reading parent commit"); html("</td></tr>"); continue; } html("<tr><th>parent</th>" "<td colspan='2' class='sha1'>" "<a href='"); query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); htmlf("'>%s</a> (<a href='", sha1_to_hex(p->item->object.sha1)); - query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), + query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), sha1_to_hex(commit->tree->object.sha1)); html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); html("'>diff</a>)</td></tr>"); } if (cgit_repo->snapshots) { htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); filename = fmt("%s-%s.zip", cgit_query_repo, hex); html_attr(cgit_pageurl(cgit_query_repo, "snapshot", - fmt("id=%s&name=%s", hex, filename))); + fmt("id=%s&name=%s", hex, filename))); htmlf("'>%s</a></td></tr>", filename); } html("</table>\n"); html("<div class='commit-subject'>"); html_txt(info->subject); html("</div>"); html("<div class='commit-msg'>"); html_txt(info->msg); html("</div>"); if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { html("<div class='diffstat-header'>Diffstat</div>"); html("<table class='diffstat'>"); max_changes = 0; cgit_diff_commit(commit, inspect_filepair); for(i = 0; i<files; i++) print_fileinfo(&items[i]); html("</table>"); html("<div class='diffstat-summary'>"); htmlf("%d files changed, %d insertions, %d deletions (", files, total_adds, total_rems); query = fmt("h=%s", hex); html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); html("show diff</a>)"); html("</div>"); } cgit_free_commitinfo(info); } @@ -85,44 +85,44 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) "<th class='left'>Message</th>"); if (cgit_repo->enable_log_filecount) { html("<th class='left'>Files</th>"); if (cgit_repo->enable_log_linecount) html("<th class='left'>Lines</th>"); } html("<th class='left'>Author</th></tr>\n"); if (ofs<0) ofs = 0; for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { free(commit->buffer); commit->buffer = NULL; free_commit_list(commit->parents); commit->parents = NULL; } for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { print_commit(commit); free(commit->buffer); commit->buffer = NULL; free_commit_list(commit->parents); commit->parents = NULL; } html("</table>\n"); html("<div class='pager'>"); if (ofs > 0) { html(" <a href='"); html(cgit_pageurl(cgit_query_repo, cgit_query_page, - fmt("h=%s&ofs=%d", tip, ofs-cnt))); + fmt("h=%s&ofs=%d", tip, ofs-cnt))); html("'>[prev]</a> "); } if ((commit = get_revision(&rev)) != NULL) { html(" <a href='"); html(cgit_pageurl(cgit_query_repo, "log", - fmt("h=%s&ofs=%d", tip, ofs+cnt))); + fmt("h=%s&ofs=%d", tip, ofs+cnt))); html("'>[next]</a> "); } html("</div>"); } diff --git a/ui-shared.c b/ui-shared.c index c8c1c21..aba93e8 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -40,67 +40,67 @@ void cgit_print_error(char *msg) html("</div>\n"); } char *cgit_rooturl() { if (cgit_virtual_root) return fmt("%s/", cgit_virtual_root); else return cgit_script_name; } char *cgit_repourl(const char *reponame) { if (cgit_virtual_root) { return fmt("%s/%s/", cgit_virtual_root, reponame); } else { return fmt("?r=%s", reponame); } } char *cgit_pageurl(const char *reponame, const char *pagename, const char *query) { if (cgit_virtual_root) { if (query) return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, pagename, query); else return fmt("%s/%s/%s/", cgit_virtual_root, reponame, pagename); } else { if (query) - return fmt("?r=%s&p=%s&%s", reponame, pagename, query); + return fmt("?r=%s&p=%s&%s", reponame, pagename, query); else - return fmt("?r=%s&p=%s", reponame, pagename); + return fmt("?r=%s&p=%s", reponame, pagename); } } char *cgit_currurl() { if (!cgit_virtual_root) return cgit_script_name; else if (cgit_query_page) return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); else if (cgit_query_repo) return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); else return fmt("%s/", cgit_virtual_root); } void cgit_print_date(time_t secs, char *format) { char buf[64]; struct tm *time; time = gmtime(&secs); strftime(buf, sizeof(buf)-1, format, time); html_txt(buf); } void cgit_print_age(time_t t, time_t max_relative, char *format) { time_t now, secs; time(&now); secs = now - t; diff --git a/ui-summary.c b/ui-summary.c index 18608b8..15e8aec 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -130,65 +130,65 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; struct object *obj; char buf[256], *url; unsigned char fileid[20]; if (prefixcmp(refname, "refs/archives")) return 0; strncpy(buf, refname+14, sizeof(buf)); obj = parse_object(sha1); if (!obj) return 1; if (obj->type == OBJ_TAG) { tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 0; hashcpy(fileid, tag->tagged->sha1); } else if (obj->type != OBJ_BLOB) { return 0; } else { hashcpy(fileid, sha1); } if (!header) { html("<table id='downloads'>"); html("<tr><th>Downloads</th></tr>"); header = 1; } html("<tr><td>"); url = cgit_pageurl(cgit_query_repo, "blob", - fmt("id=%s&path=%s", sha1_to_hex(fileid), + fmt("id=%s&path=%s", sha1_to_hex(fileid), buf)); html_link_open(url, NULL, NULL); html_txt(buf); html_link_close(); html("</td></tr>"); return 0; } static void cgit_print_branches() { html("<tr class='nohover'><th class='left'>Branch</th>" "<th class='left'>Idle</th>" "<th class='left'>Author</th>" "<th class='left'>Head commit</th></tr>\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); } static void cgit_print_tags() { header = 0; for_each_tag_ref(cgit_print_tag_cb, NULL); } static void cgit_print_archives() { header = 0; for_each_ref(cgit_print_archive_cb, NULL); if (header) html("</table>"); } void cgit_print_summary() @@ -8,83 +8,83 @@ #include "cgit.h" char *curr_rev; static int print_entry(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned int mode, int stage) { char *name; enum object_type type; unsigned long size = 0; name = xstrdup(pathname); type = sha1_object_info(sha1, &size); if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", name, sha1_to_hex(sha1)); return 0; } html("<tr><td class='filemode'>"); html_filemode(mode); html("</td><td "); if (S_ISDIRLNK(mode)) { htmlf("class='ls-mod'><a href='"); html_attr(fmt(cgit_repo->module_link, name, sha1_to_hex(sha1))); } else if (S_ISDIR(mode)) { html("class='ls-dir'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "tree", - fmt("h=%s&id=%s&path=%s%s/", + fmt("h=%s&id=%s&path=%s%s/", curr_rev, sha1_to_hex(sha1), cgit_query_path ? cgit_query_path : "", pathname))); } else { html("class='ls-blob'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "view", - fmt("h=%s&id=%s&path=%s%s", curr_rev, + fmt("h=%s&id=%s&path=%s%s", curr_rev, sha1_to_hex(sha1), cgit_query_path ? cgit_query_path : "", pathname))); } htmlf("'>%s</a></td>", name); htmlf("<td class='filesize'>%li</td>", size); html("<td class='links'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "log", - fmt("h=%s&path=%s%s", + fmt("h=%s&path=%s%s", curr_rev, cgit_query_path ? cgit_query_path : "", pathname))); html("'>history</a></td>"); html("</tr>\n"); free(name); return 0; } void cgit_print_tree(const char *rev, const char *hex, char *path) { struct tree *tree; unsigned char sha1[20]; struct commit *commit; curr_rev = xstrdup(rev); get_sha1(rev, sha1); commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) { cgit_print_error(fmt("Invalid head: %s", rev)); return; } if (!hex) hex = sha1_to_hex(commit->tree->object.sha1); if (get_sha1_hex(hex, sha1)) { cgit_print_error(fmt("Invalid object id: %s", hex)); return; } tree = parse_tree_indirect(sha1); if (!tree) { cgit_print_error(fmt("Not a tree object: %s", hex)); @@ -14,42 +14,42 @@ void cgit_print_view(const char *hex, char *path) enum object_type type; unsigned char *buf; unsigned long size; if (get_sha1_hex(hex, sha1)){ cgit_print_error(fmt("Bad hex value: %s", hex)); return; } type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object name: %s", hex)); return; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { cgit_print_error(fmt("Error reading object %s", hex)); return; } buf[size] = '\0'; html("<table class='list'>\n"); html("<tr class='nohover'><th class='left'>"); if (path) htmlf("%s (", path); htmlf("%s %s, %li bytes", typename(type), hex, size); if (path) html(")"); html(" <a href='"); html_attr(cgit_pageurl(cgit_query_repo, "blob", - fmt("id=%s&path=%s", + fmt("id=%s&path=%s", hex, path))); html("'>download</a>"); html("</th></tr>\n"); html("<tr><td class='blob'>\n"); html_txt(buf); html("\n</td></tr>\n"); html("</table>\n"); } |