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

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2006-12-13 00:13:27 +01:00
parent 58d04f6523
commit 06fe0c2f47
9 changed files with 113 additions and 8 deletions

View File

@ -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

6
cgit.c
View File

@ -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);
}

View File

@ -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;
}
}
div.ls-dir a {
font-weight: bold;
}
th.filesize, td.filesize {
text-align: right;
}
th.filemode, td.filemode {
text-align: center;
}

1
cgit.h
View File

@ -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 */

13
git.h
View File

@ -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 */

View File

@ -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);

View File

@ -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>");
}

70
ui-tree.c Normal file
View File

@ -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");
}

View File

@ -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;
}