| -rw-r--r-- | cgit.c | 5 | ||||
| -rw-r--r-- | cgit.css | 5 | ||||
| -rw-r--r-- | cgit.h | 4 | ||||
| -rw-r--r-- | ui-commit.c | 3 | ||||
| -rw-r--r-- | ui-log.c | 8 | ||||
| -rw-r--r-- | ui-tree.c | 25 |
6 files changed, 37 insertions, 13 deletions
@@ -103,19 +103,20 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_docend(); return; } cgit_print_pageheader(cgit_query_page, show_search); if (!strcmp(cgit_query_page, "log")) { cgit_print_log(cgit_query_head, cgit_query_ofs, - cgit_max_commit_count, cgit_query_search); + cgit_max_commit_count, cgit_query_search, + cgit_query_path); } else if (!strcmp(cgit_query_page, "tree")) { - cgit_print_tree(cgit_query_sha1, cgit_query_path); + cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); } else if (!strcmp(cgit_query_page, "commit")) { cgit_print_commit(cgit_query_sha1); } else if (!strcmp(cgit_query_page, "view")) { cgit_print_view(cgit_query_sha1, cgit_query_path); } else if (!strcmp(cgit_query_page, "diff")) { cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); } else { cgit_print_error("Invalid request"); @@ -184,16 +184,21 @@ div.ls-dir a { th.filesize, td.filesize { text-align: right; } td.filesize { font-family: monospace; } +td.links { + font-size: 80%; + padding-left: 2em; +} + td.filemode { font-family: monospace; } td.blob { white-space: pre; font-family: monospace; background-color: white; @@ -164,19 +164,19 @@ extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_docend(); extern void cgit_print_pageheader(char *title, int show_search); extern void cgit_print_snapshot_start(const char *mimetype, const char *filename, struct cacheitem *item); extern void cgit_print_repolist(struct cacheitem *item); extern void cgit_print_summary(); -extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); +extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); extern void cgit_print_view(const char *hex, char *path); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); -extern void cgit_print_tree(const char *hex, char *path); +extern void cgit_print_tree(const char *rev, const char *hex, char *path); extern void cgit_print_commit(const char *hex); extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path); extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, const char *format, const char *prefix, const char *filename); #endif /* CGIT_H */ diff --git a/ui-commit.c b/ui-commit.c index b3d1c28..20a7cb2 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -181,17 +181,18 @@ void cgit_print_commit(const char *hex) 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); html("</td></tr>\n"); html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); - query = fmt("id=%s", sha1_to_hex(commit->tree->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>"); @@ -48,26 +48,30 @@ void print_commit(struct commit *commit) htmlf("%d", lines); html("</td><td>"); html_txt(info->author); html("</td></tr>\n"); cgit_free_commitinfo(info); } -void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) +void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) { struct rev_info rev; struct commit *commit; - const char *argv[3] = {NULL, tip, NULL}; + const char *argv[] = {NULL, tip, NULL, NULL, NULL}; int argc = 2; int i; if (grep) argv[argc++] = fmt("--grep=%s", grep); + if (path) { + argv[argc++] = "--"; + argv[argc++] = path; + } init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); if (rev.grep_filter) { rev.grep_filter->regflags |= REG_ICASE; @@ -3,19 +3,20 @@ * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #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, +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); @@ -30,52 +31,64 @@ static int print_entry(const unsigned char *sha1, const char *base, 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("id=%s&path=%s%s/", + html_attr(cgit_pageurl(cgit_query_repo, "tree", + 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("id=%s&path=%s%s", sha1_to_hex(sha1), + fmt("h=%s&id=%s&path=%s%s", curr_rev, + sha1_to_hex(sha1), cgit_query_path ? cgit_query_path : "", pathname))); } htmlf("'>%s</a></div></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", + 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 *hex, char *path) +void cgit_print_tree(const char *rev, const char *hex, char *path) { struct tree *tree; unsigned char sha1[20]; + curr_rev = xstrdup(rev); 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)); return; } html_txt(path); html("<table class='list'>\n"); html("<tr class='nohover'>"); html("<th class='left'>Mode</th>"); html("<th class='left'>Name</th>"); html("<th class='right'>Size</th>"); + html("<th/>"); html("</tr>\n"); read_tree_recursive(tree, "", 0, 1, NULL, print_entry); html("</table>\n"); } |