Add display of tree content w/ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/Makefile b/Makefile
index c02963718f28bf5782379f76d9078a21e563d172..4d2ede3d49391e61fd6b7105ffbc833239ecc689 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
-       ui-summary.o ui-log.o ui-view.c
+       ui-summary.o ui-log.o ui-view.c ui-tree.c
 
 CFLAGS += -Wall
 

diff --git a/cgit.c b/cgit.c
index 0f72f2d67ba9e81c97da65d03552eff117794d18..ada488b66dec98696fe5547287b2957a6d19581f 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -26,10 +26,12 @@ static void cgit_print_repo_page(struct cacheitem *item)
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
        cgit_print_docstart(title, item);
        cgit_print_pageheader(title);
-       if (!cgit_query_page)
+       if (!cgit_query_page) {
                cgit_print_summary();
-       else if (!strcmp(cgit_query_page, "log")) {
+       } else if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, 0, 100);
+       } else if (!strcmp(cgit_query_page, "tree")) {
+               cgit_print_tree(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "view")) {
                cgit_print_view(cgit_query_sha1);
        }

diff --git a/cgit.css b/cgit.css
index 3ed0c226c58bbfb930642de84fee74a1de15baa9..c16f3f2d4377d7338675c26c7daa9f51142edf52 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -30,7 +30,7 @@ table.list th {
 }
 table.list td {
        border: none;
-       padding: 0.1em 0.5em;
+       padding: 0.1em 1em 0.1em 0.5em;
        background: white;
 }
 
@@ -60,4 +60,13 @@ div.error {
        color: red;
        font-weight: bold;
        margin: 1em 2em;
-}
\ No newline at end of file
+}
+div.ls-dir a {
+       font-weight: bold;
+}
+th.filesize, td.filesize {
+       text-align: right;
+}
+th.filemode, td.filemode {
+       text-align: center;
+}

diff --git a/cgit.h b/cgit.h
index c9554a7ae759d5748df6570250e74232271944be..2fdfab3edf700d3fe8154d44b80c3dbe18394038 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -83,5 +83,6 @@ 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);
 extern void cgit_print_view(char *hex);
+extern void cgit_print_tree(const char *sha1);
 
 #endif /* CGIT_H */

diff --git a/git.h b/git.h
index dfa3542256bbbfa963f83670dc2f8b49d0b960ff..a3f977c5cb86b2ec066d50017f94fb6154741a2b 100644 (file)
--- a/git.h
+++ b/git.h
@@ -188,6 +188,19 @@ struct tree {
 };
 
 
+struct tree *lookup_tree(const unsigned char *sha1);
+int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
+int parse_tree(struct tree *tree);
+struct tree *parse_tree_indirect(const unsigned char *sha1);
+
+typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int);
+
+extern int read_tree_recursive(struct tree *tree,
+                              const char *base, int baselen,
+                              int stage, const char **match,
+                              read_tree_fn_t fn);
+
+extern int read_tree(struct tree *tree, int stage, const char **paths);
 
 
 /* from git:commit.h */

diff --git a/ui-log.c b/ui-log.c
index 701c3929b68d6870dab9e6533889469991c49cf7..4d2c2e0dcbc499b0c9db15f41ea3f41aba5ded31 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -82,6 +82,11 @@ static void cgit_print_commit_shortlog(struct commit *commit)
        html_link_close();
        html("</td><td>");
        html_txt(author);
+       html("</td><td><a href='");
+       html_attr(cgit_pageurl(cgit_query_repo, "tree", 
+                              fmt("id=%s", 
+                                  sha1_to_hex(commit->tree->object.sha1))));
+       html("'>tree</a>");
        html("</td></tr>\n");
 }
 
@@ -102,7 +107,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
 
        html("<h2>Log</h2>");
        html("<table class='list'>");
-       html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n");
+       html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</th></tr>\n");
        while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
                cgit_print_commit_shortlog(commit);
                free(commit->buffer);

diff --git a/ui-summary.c b/ui-summary.c
index cc918adbb39faad1dbfdc98bc2ab387688272cde..29baa74d7550cf0caabe98bc552a604f570a28d2 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -27,6 +27,11 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
                                    sizeof(buf), 0, NULL, NULL, 0);
                html_txt(buf);
+               html("</td><td><a href='");
+               html_attr(cgit_pageurl(cgit_query_repo, "tree", 
+                                      fmt("id=%s", 
+                                          sha1_to_hex(commit->tree->object.sha1))));
+               html("'>tree</a>");
                html("</td></tr>\n");
        } else {
                html("<tr><td>");
@@ -41,7 +46,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 static void cgit_print_branches()
 {
        html("<table class='list'>");
-       html("<tr><th>Branch name</th><th>Head commit</th></tr>\n");
+       html("<tr><th>Branch name</th><th>Latest</th><th>Link</th></tr>\n");
        for_each_branch_ref(cgit_print_branch_cb, NULL);
        html("</table>");
 }

diff --git a/ui-tree.c b/ui-tree.c
new file mode 100644 (file)
index 0000000..84930cb
--- /dev/null
+++ b/ui-tree.c
@@ -0,0 +1,70 @@
+/* ui-tree.c: functions for tree output
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+
+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;
+
+       if (sha1_object_info(sha1, type, &size)) {
+               cgit_print_error(fmt("Bad object name: %s", 
+                                    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))));
+       } else {
+               html("<div class='ls-blob'><a href='");
+               html_attr(cgit_pageurl(cgit_query_repo, "view",
+                                     fmt("id=%s", sha1_to_hex(sha1))));
+       }
+       html("'>");
+       html_txt(name);
+       if (S_ISDIR(mode))
+               html("/");
+       html("</a></div></td>");
+       htmlf("<td class='filesize'>%li</td>", size);
+       htmlf("<td class='filemode'>%06o</td>", mode);
+       html("</tr>\n");
+       free(name);
+       return 0;
+}
+
+void cgit_print_tree(const char *hex)
+{
+       struct tree *tree;
+       unsigned char sha1[20];
+
+       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("<h2>Tree content</h2>\n");
+       html("<table class='list'>\n");
+       html("<tr><th>Name</th>");
+       html("<th class='filesize'>Size</th>");
+       html("<th class='filemode'>Mode</th></tr>\n");
+       read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
+       html("</table>\n");
+}

diff --git a/ui-view.c b/ui-view.c
index 193c6858783f808577703840dd8ebc2ce344260c..1bf84722b75da0896d2817b635f75e875bc7a4f2 100644 (file)
--- a/ui-view.c
+++ b/ui-view.c
@@ -20,7 +20,7 @@ void cgit_print_view(char *hex)
                return;
        }
 
-       if (sha1_object_info(sha1, type, NULL)){
+       if (sha1_object_info(sha1, type, &size)){
                cgit_print_error("Bad object name");
                return;
        }