aboutsummaryrefslogtreecommitdiffstats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-06-22 16:15:48 +0200
committerLars Hjemli <hjemli@gmail.com>2010-06-22 16:15:48 +0200
commit37a24e4e39737edaa5cdde501346a65eeb280e63 (patch)
treeff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-tree.c
parent47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff)
parenta2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff)
downloadcgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz
cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2
cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip
Merge branch 'jh/path-limit'
Conflicts: cgit.h ui-commit.c
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 0ee38f2..75ec9cb 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -102,10 +102,10 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
return;
}
- html(" (");
+ htmlf("blob: %s (", sha1_to_hex(sha1));
cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
curr_rev, path);
- htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+ html(")\n");
if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
@@ -225,17 +225,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
{
static int state;
static char buffer[PATH_MAX];
- char *url;
if (state == 0) {
memcpy(buffer, base, baselen);
strcpy(buffer+baselen, pathname);
- url = cgit_pageurl(ctx.qry.repo, "tree",
- fmt("h=%s&amp;path=%s", curr_rev, buffer));
- html("/");
- cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
- curr_rev, buffer);
-
if (strcmp(match_path, buffer))
return READ_TREE_RECURSIVE;
@@ -278,10 +271,6 @@ void cgit_print_tree(const char *rev, char *path)
return;
}
- html("path: <a href='");
- html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
- html("'>root</a>");
-
if (path == NULL) {
ls_tree(commit->tree->object.sha1, NULL);
return;