X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/06fe0c2f47eaf467db8ab1443e61dfa1c280f30a..5e75128a8bee885d83563d8c521172328d511d12:/ui-tree.c?ds=sidebyside

diff --git a/ui-tree.c b/ui-tree.c
index 84930cb..032a966 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -8,47 +8,78 @@
 
 #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;
-	char type[20];
-	unsigned long size;
+	enum object_type type;
+	unsigned long size = 0;
 
-	if (sha1_object_info(sha1, type, &size)) {
-		cgit_print_error(fmt("Bad object name: %s", 
-				     sha1_to_hex(sha1)));
+	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;
 	}
-	name = xstrdup(pathname);
-	html("<tr><td>");
-	if (S_ISDIR(mode)) {
-		html("<div class='ls-dir'><a href='");
-		html_attr(cgit_pageurl(cgit_query_repo, "tree", 
-				       fmt("id=%s", sha1_to_hex(sha1))));
+	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/",
+					   curr_rev,
+					   sha1_to_hex(sha1),
+					   cgit_query_path ? cgit_query_path : "",
+					   pathname)));
 	} else {
-		html("<div class='ls-blob'><a href='");
+		html("class='ls-blob'><a href='");
 		html_attr(cgit_pageurl(cgit_query_repo, "view",
-				      fmt("id=%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)));
 	}
-	html("'>");
-	html_txt(name);
-	if (S_ISDIR(mode))
-		html("/");
-	html("</a></div></td>");
+	htmlf("'>%s</a></div></td>", name);
 	htmlf("<td class='filesize'>%li</td>", size);
-	htmlf("<td class='filemode'>%06o</td>", mode);
+
+	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)
+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));
@@ -60,11 +91,14 @@ void cgit_print_tree(const char *hex)
 		return;
 	}
 
-	html("<h2>Tree content</h2>\n");
+	html_txt(path);
 	html("<table class='list'>\n");
-	html("<tr><th>Name</th>");
-	html("<th class='filesize'>Size</th>");
-	html("<th class='filemode'>Mode</th></tr>\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");
 }