summaryrefslogtreecommitdiffabout
path: root/ui-tree.c
authorLars Hjemli <hjemli@gmail.com>2007-05-14 09:10:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-14 09:13:18 (UTC)
commit9fb53af215639fcd3bfb876fa9c8bac221244bdf (patch) (unidiff)
tree3ebbebebed59b53066e16720a32e1b34c54dc609 /ui-tree.c
parent4fdf571c888fd38ae362684c429a3bdf24240ef7 (diff)
downloadcgit-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>
Diffstat (limited to 'ui-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/ui-tree.c b/ui-tree.c
index dee8309..db63e13 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,81 +1,94 @@
1/* ui-tree.c: functions for tree output 1/* ui-tree.c: functions for tree output
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11char *curr_rev;
11 12
12static int print_entry(const unsigned char *sha1, const char *base, 13static int print_entry(const unsigned char *sha1, const char *base,
13 int baselen, const char *pathname, unsigned int mode, 14 int baselen, const char *pathname, unsigned int mode,
14 int stage) 15 int stage)
15{ 16{
16 char *name; 17 char *name;
17 enum object_type type; 18 enum object_type type;
18 unsigned long size = 0; 19 unsigned long size = 0;
19 20
20 name = xstrdup(pathname); 21 name = xstrdup(pathname);
21 type = sha1_object_info(sha1, &size); 22 type = sha1_object_info(sha1, &size);
22 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { 23 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
23 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 24 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
24 name, 25 name,
25 sha1_to_hex(sha1)); 26 sha1_to_hex(sha1));
26 return 0; 27 return 0;
27 } 28 }
28 html("<tr><td class='filemode'>"); 29 html("<tr><td class='filemode'>");
29 html_filemode(mode); 30 html_filemode(mode);
30 html("</td><td "); 31 html("</td><td ");
31 if (S_ISDIRLNK(mode)) { 32 if (S_ISDIRLNK(mode)) {
32 htmlf("class='ls-mod'><a href='"); 33 htmlf("class='ls-mod'><a href='");
33 html_attr(fmt(cgit_repo->module_link, 34 html_attr(fmt(cgit_repo->module_link,
34 name, 35 name,
35 sha1_to_hex(sha1))); 36 sha1_to_hex(sha1)));
36 } else if (S_ISDIR(mode)) { 37 } else if (S_ISDIR(mode)) {
37 html("class='ls-dir'><a href='"); 38 html("class='ls-dir'><a href='");
38 html_attr(cgit_pageurl(cgit_query_repo, "tree", 39 html_attr(cgit_pageurl(cgit_query_repo, "tree",
39 fmt("id=%s&path=%s%s/", 40 fmt("h=%s&id=%s&path=%s%s/",
41 curr_rev,
40 sha1_to_hex(sha1), 42 sha1_to_hex(sha1),
41 cgit_query_path ? cgit_query_path : "", 43 cgit_query_path ? cgit_query_path : "",
42 pathname))); 44 pathname)));
43 } else { 45 } else {
44 html("class='ls-blob'><a href='"); 46 html("class='ls-blob'><a href='");
45 html_attr(cgit_pageurl(cgit_query_repo, "view", 47 html_attr(cgit_pageurl(cgit_query_repo, "view",
46 fmt("id=%s&path=%s%s", sha1_to_hex(sha1), 48 fmt("h=%s&id=%s&path=%s%s", curr_rev,
49 sha1_to_hex(sha1),
47 cgit_query_path ? cgit_query_path : "", 50 cgit_query_path ? cgit_query_path : "",
48 pathname))); 51 pathname)));
49 } 52 }
50 htmlf("'>%s</a></div></td>", name); 53 htmlf("'>%s</a></div></td>", name);
51 htmlf("<td class='filesize'>%li</td>", size); 54 htmlf("<td class='filesize'>%li</td>", size);
55
56 html("<td class='links'><a href='");
57 html_attr(cgit_pageurl(cgit_query_repo, "log",
58 fmt("h=%s&path=%s%s",
59 curr_rev,
60 cgit_query_path ? cgit_query_path : "",
61 pathname)));
62 html("'>history</a></td>");
52 html("</tr>\n"); 63 html("</tr>\n");
53 free(name); 64 free(name);
54 return 0; 65 return 0;
55} 66}
56 67
57void cgit_print_tree(const char *hex, char *path) 68void cgit_print_tree(const char *rev, const char *hex, char *path)
58{ 69{
59 struct tree *tree; 70 struct tree *tree;
60 unsigned char sha1[20]; 71 unsigned char sha1[20];
61 72
73 curr_rev = xstrdup(rev);
62 if (get_sha1_hex(hex, sha1)) { 74 if (get_sha1_hex(hex, sha1)) {
63 cgit_print_error(fmt("Invalid object id: %s", hex)); 75 cgit_print_error(fmt("Invalid object id: %s", hex));
64 return; 76 return;
65 } 77 }
66 tree = parse_tree_indirect(sha1); 78 tree = parse_tree_indirect(sha1);
67 if (!tree) { 79 if (!tree) {
68 cgit_print_error(fmt("Not a tree object: %s", hex)); 80 cgit_print_error(fmt("Not a tree object: %s", hex));
69 return; 81 return;
70 } 82 }
71 83
72 html_txt(path); 84 html_txt(path);
73 html("<table class='list'>\n"); 85 html("<table class='list'>\n");
74 html("<tr class='nohover'>"); 86 html("<tr class='nohover'>");
75 html("<th class='left'>Mode</th>"); 87 html("<th class='left'>Mode</th>");
76 html("<th class='left'>Name</th>"); 88 html("<th class='left'>Name</th>");
77 html("<th class='right'>Size</th>"); 89 html("<th class='right'>Size</th>");
90 html("<th/>");
78 html("</tr>\n"); 91 html("</tr>\n");
79 read_tree_recursive(tree, "", 0, 1, NULL, print_entry); 92 read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
80 html("</table>\n"); 93 html("</table>\n");
81} 94}