author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 09:10:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 09:13:18 (UTC) |
commit | 9fb53af215639fcd3bfb876fa9c8bac221244bdf (patch) (side-by-side diff) | |
tree | 3ebbebebed59b53066e16720a32e1b34c54dc609 | |
parent | 4fdf571c888fd38ae362684c429a3bdf24240ef7 (diff) | |
download | cgit-9fb53af215639fcd3bfb876fa9c8bac221244bdf.zip cgit-9fb53af215639fcd3bfb876fa9c8bac221244bdf.tar.gz cgit-9fb53af215639fcd3bfb876fa9c8bac221244bdf.tar.bz2 |
Add log filtering by path and link to it from tree view
This enables path-filtering in log-view, and adds a link per entry in
tree-view to show the log for each file/directory.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-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 | 19 |
6 files changed, 34 insertions, 10 deletions
@@ -109,7 +109,8 @@ static void cgit_print_repo_page(struct cacheitem *item) 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); @@ -190,4 +190,9 @@ td.filesize { } +td.links { + font-size: 80%; + padding-left: 2em; +} + td.filemode { font-family: monospace; @@ -170,8 +170,8 @@ extern void cgit_print_snapshot_start(const char *mimetype, 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); diff --git a/ui-commit.c b/ui-commit.c index b3d1c28..20a7cb2 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -187,5 +187,6 @@ void cgit_print_commit(const char *hex) 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)); @@ -54,9 +54,9 @@ void print_commit(struct commit *commit) -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; @@ -64,4 +64,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) if (grep) argv[argc++] = fmt("--grep=%s", grep); + if (path) { + argv[argc++] = "--"; + argv[argc++] = path; + } init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; @@ -9,4 +9,5 @@ #include "cgit.h" +char *curr_rev; static int print_entry(const unsigned char *sha1, const char *base, @@ -37,5 +38,6 @@ static int print_entry(const unsigned char *sha1, const char *base, html("class='ls-dir'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "tree", - fmt("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 : "", @@ -44,5 +46,6 @@ static int print_entry(const unsigned char *sha1, const char *base, 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))); @@ -50,4 +53,12 @@ static int print_entry(const unsigned char *sha1, const char *base, 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); @@ -55,9 +66,10 @@ static int print_entry(const unsigned char *sha1, const char *base, } -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)); @@ -76,4 +88,5 @@ void cgit_print_tree(const char *hex, char *path) 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); |