aboutsummaryrefslogtreecommitdiffstats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-08 22:40:59 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-08 23:38:49 +0200
commit61c3ca978c586c673aec618cb94210657278dda8 (patch)
tree7011987769e65ad0e7aa8b79f648357e9cd88c30 /ui-tree.c
parent66cacd053ba900c8eb3b7962027370c84a97f990 (diff)
downloadcgit-61c3ca978c586c673aec618cb94210657278dda8.tar.gz
cgit-61c3ca978c586c673aec618cb94210657278dda8.tar.bz2
cgit-61c3ca978c586c673aec618cb94210657278dda8.zip
Update to libgit 1.5.2-rc2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/ui-tree.c b/ui-tree.c
index b00670e..60f7560 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -14,37 +14,39 @@ static int print_entry(const unsigned char *sha1, const char *base,
int stage)
{
char *name;
- char type[20];
+ enum object_type type;
unsigned long size;
- 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) {
+ htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+ name,
+ sha1_to_hex(sha1));
return 0;
}
- name = xstrdup(pathname);
html("<tr><td class='filemode'>");
html_filemode(mode);
html("</td><td>");
- if (S_ISDIR(mode)) {
+ if (S_ISDIRLNK(mode)) {
+ htmlf("<div class='ls-dirlnk'>%s => submodule</div>", name);
+ } else if (S_ISDIR(mode)) {
html("<div class='ls-dir'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "tree",
fmt("id=%s&path=%s%s/",
sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
+ htmlf("'>%s</a></div>", name);
} else {
html("<div class='ls-blob'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "view",
fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
+ htmlf("'>%s</a></div>", name);
}
- html("'>");
- html_txt(name);
- if (S_ISDIR(mode))
- html("/");
- html("</a></div></td>");
+ html("</div></td>");
htmlf("<td class='filesize'>%li</td>", size);
html("</tr>\n");
free(name);