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

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

9 files changed, 113 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index c029637..4d2ede3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 CGIT_VERSION = 0.1-pre
 
 INSTALL_BIN = /var/www/htdocs/cgit.cgi
 INSTALL_CSS = /var/www/htdocs/cgit.css
 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
 
 all: cgit
 
 install: all
         install cgit $(INSTALL_BIN)
         install cgit.css $(INSTALL_CSS)
         rm -rf $(CACHE_ROOT)/*
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
diff --git a/cgit.c b/cgit.c
index 0f72f2d..ada488b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -17,28 +17,30 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title);
                 cgit_print_error(fmt("Unable to scan repository: %s",
                                      strerror(errno)));
                 cgit_print_docend();
                 return;
         }
         setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
         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);
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
         htmlfd = item->fd;
         item->st.st_mtime = time(NULL);
         if (cgit_query_repo)
                 cgit_print_repo_page(item);
diff --git a/cgit.css b/cgit.css
index 3ed0c22..c16f3f2 100644
--- a/cgit.css
+++ b/cgit.css
@@ -21,25 +21,25 @@ table.list {
 }
 
 table.list th {
         text-align: left;
         font-weight: bold;
         background: #ddd;
         border-bottom: solid 1px #aaa;
         padding: 0.1em 0.5em 0.1em;
         vertical-align: baseline;
 }
 table.list td {
         border: none;
-        padding: 0.1em 0.5em;
+        padding: 0.1em 1em 0.1em 0.5em;
         background: white;
 }
 
 img {
         border: none;
 }
 
 
 div#header {
         background-color: #ddd;
         padding: 0.25em 0.25em 0.25em 0.5em;
         font-size: 150%;
@@ -51,13 +51,22 @@ div#header {
 div#header img#logo {
         float: right;
 }
 
 div#content {
         margin: 0.5em 0.5em;
 }
 
 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 c9554a7..2fdfab3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -74,14 +74,15 @@ extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
                           const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);
 
 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 dfa3542..a3f977c 100644
--- a/git.h
+++ b/git.h
@@ -179,24 +179,37 @@ struct object {
 
 /*
  * from git:tree.h
  */
 
 struct tree {
         struct object object;
         void *buffer;
         unsigned long size;
 };
 
 
+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 */
 
 struct commit_list {
         struct commit *item;
         struct commit_list *next;
 };
 
 struct commit {
         struct object object;
         void *util;
diff --git a/ui-log.c b/ui-log.c
index 701c392..4d2c2e0 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -73,43 +73,48 @@ static void cgit_print_commit_shortlog(struct commit *commit)
 
         html("<tr><td>");
         strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
         html_txt(buf);
         html("</td><td>");
         char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
         char *url = cgit_pageurl(cgit_query_repo, "view", qry);
         html_link_open(url, NULL, NULL);
         html_txt(subject);
         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");
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt)
 {
         struct rev_info rev;
         struct commit *commit;
         const char *argv[2] = {NULL, tip};
         int n = 0;
         
         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(2, argv, &rev, NULL);
         prepare_revision_walk(&rev);
 
         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);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         html("</table>\n");
 }
 
diff --git a/ui-summary.c b/ui-summary.c
index cc918ad..29baa74 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -18,38 +18,43 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
         if (commit && !parse_commit(commit)){
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "log", 
                                    fmt("h=%s", refname));
                 html_link_open(url, NULL, NULL);
                 strncpy(buf, refname, sizeof(buf));
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
                 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>");
                 html_txt(buf);
                 html("</td><td>");
                 htmlf("*** bad ref %s", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 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>");
 }
 
 void cgit_print_summary()
 {
         html("<h2>");
         html_txt("Repo summary page");
         html("</h2>");
         cgit_print_branches();
 }
diff --git a/ui-tree.c b/ui-tree.c
new file mode 100644
index 0000000..84930cb
--- a/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 193c685..1bf8472 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -11,25 +11,25 @@
 void cgit_print_view(char *hex)
 {
         unsigned char sha1[20];
         char type[20];
         unsigned char *buf;
         unsigned long size;
 
         if (get_sha1_hex(hex, sha1)){
                 cgit_print_error(fmt("Bad hex value: %s", hex));
                 return;
         }
 
-        if (sha1_object_info(sha1, type, NULL)){
+        if (sha1_object_info(sha1, type, &size)){
                 cgit_print_error("Bad object name");
                 return;
         }
 
         buf = read_sha1_file(sha1, type, &size);
         if (!buf) {
                 cgit_print_error("Error reading object");
                 return;
         }
 
         buf[size] = '\0';
         html("<h2>Object view</h2>");