| -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 @@ -66,25 +66,25 @@ void print_fileinfo(struct fileinfo *info) } 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); @@ -173,53 +173,53 @@ void cgit_print_commit(const char *hex) 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'>"); @@ -105,24 +105,24 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) 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 @@ -60,27 +60,27 @@ char *cgit_repourl(const char *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 diff --git a/ui-summary.c b/ui-summary.c index 18608b8..15e8aec 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -150,25 +150,25 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *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>" @@ -28,43 +28,43 @@ static int print_entry(const unsigned char *sha1, const char *base, } 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; @@ -34,22 +34,22 @@ void cgit_print_view(const char *hex, char *path) 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"); } |