|
diff --git a/ui-tree.c b/ui-tree.c index cb57d8d..21dd533 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,96 +1,96 @@ |
1 | /* ui-tree.c: functions for tree output |
1 | /* ui-tree.c: functions for tree output |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | char *curr_rev; |
11 | char *curr_rev; |
12 | |
12 | |
13 | static int print_entry(const unsigned char *sha1, const char *base, |
13 | static int print_entry(const unsigned char *sha1, const char *base, |
14 | int baselen, const char *pathname, unsigned int mode, |
14 | int baselen, const char *pathname, unsigned int mode, |
15 | int stage) |
15 | int stage) |
16 | { |
16 | { |
17 | char *name; |
17 | char *name; |
18 | enum object_type type; |
18 | enum object_type type; |
19 | unsigned long size = 0; |
19 | unsigned long size = 0; |
20 | |
20 | |
21 | name = xstrdup(pathname); |
21 | name = xstrdup(pathname); |
22 | type = sha1_object_info(sha1, &size); |
22 | type = sha1_object_info(sha1, &size); |
23 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
23 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { |
24 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
24 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
25 | name, |
25 | name, |
26 | sha1_to_hex(sha1)); |
26 | sha1_to_hex(sha1)); |
27 | return 0; |
27 | return 0; |
28 | } |
28 | } |
29 | html("<tr><td class='filemode'>"); |
29 | html("<tr><td class='filemode'>"); |
30 | html_filemode(mode); |
30 | html_filemode(mode); |
31 | html("</td><td "); |
31 | html("</td><td "); |
32 | if (S_ISDIRLNK(mode)) { |
32 | if (S_ISGITLINK(mode)) { |
33 | htmlf("class='ls-mod'><a href='"); |
33 | htmlf("class='ls-mod'><a href='"); |
34 | html_attr(fmt(cgit_repo->module_link, |
34 | html_attr(fmt(cgit_repo->module_link, |
35 | name, |
35 | name, |
36 | sha1_to_hex(sha1))); |
36 | sha1_to_hex(sha1))); |
37 | } else if (S_ISDIR(mode)) { |
37 | } else if (S_ISDIR(mode)) { |
38 | html("class='ls-dir'><a href='"); |
38 | html("class='ls-dir'><a href='"); |
39 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
39 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
40 | fmt("h=%s&id=%s&path=%s%s/", |
40 | fmt("h=%s&id=%s&path=%s%s/", |
41 | curr_rev, |
41 | curr_rev, |
42 | sha1_to_hex(sha1), |
42 | sha1_to_hex(sha1), |
43 | cgit_query_path ? cgit_query_path : "", |
43 | cgit_query_path ? cgit_query_path : "", |
44 | pathname))); |
44 | pathname))); |
45 | } else { |
45 | } else { |
46 | html("class='ls-blob'><a href='"); |
46 | html("class='ls-blob'><a href='"); |
47 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
47 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
48 | fmt("h=%s&id=%s&path=%s%s", curr_rev, |
48 | fmt("h=%s&id=%s&path=%s%s", curr_rev, |
49 | sha1_to_hex(sha1), |
49 | sha1_to_hex(sha1), |
50 | cgit_query_path ? cgit_query_path : "", |
50 | cgit_query_path ? cgit_query_path : "", |
51 | pathname))); |
51 | pathname))); |
52 | } |
52 | } |
53 | htmlf("'>%s</a></td>", name); |
53 | htmlf("'>%s</a></td>", name); |
54 | htmlf("<td class='filesize'>%li</td>", size); |
54 | htmlf("<td class='filesize'>%li</td>", size); |
55 | |
55 | |
56 | html("<td class='links'><a href='"); |
56 | html("<td class='links'><a href='"); |
57 | html_attr(cgit_pageurl(cgit_query_repo, "log", |
57 | html_attr(cgit_pageurl(cgit_query_repo, "log", |
58 | fmt("h=%s&path=%s%s", |
58 | fmt("h=%s&path=%s%s", |
59 | curr_rev, |
59 | curr_rev, |
60 | cgit_query_path ? cgit_query_path : "", |
60 | cgit_query_path ? cgit_query_path : "", |
61 | pathname))); |
61 | pathname))); |
62 | html("'>history</a></td>"); |
62 | html("'>history</a></td>"); |
63 | html("</tr>\n"); |
63 | html("</tr>\n"); |
64 | free(name); |
64 | free(name); |
65 | return 0; |
65 | return 0; |
66 | } |
66 | } |
67 | |
67 | |
68 | void cgit_print_tree(const char *rev, const char *hex, char *path) |
68 | void cgit_print_tree(const char *rev, const char *hex, char *path) |
69 | { |
69 | { |
70 | struct tree *tree; |
70 | struct tree *tree; |
71 | unsigned char sha1[20]; |
71 | unsigned char sha1[20]; |
72 | struct commit *commit; |
72 | struct commit *commit; |
73 | |
73 | |
74 | curr_rev = xstrdup(rev); |
74 | curr_rev = xstrdup(rev); |
75 | get_sha1(rev, sha1); |
75 | get_sha1(rev, sha1); |
76 | commit = lookup_commit_reference(sha1); |
76 | commit = lookup_commit_reference(sha1); |
77 | if (!commit || parse_commit(commit)) { |
77 | if (!commit || parse_commit(commit)) { |
78 | cgit_print_error(fmt("Invalid head: %s", rev)); |
78 | cgit_print_error(fmt("Invalid head: %s", rev)); |
79 | return; |
79 | return; |
80 | } |
80 | } |
81 | if (!hex) |
81 | if (!hex) |
82 | hex = sha1_to_hex(commit->tree->object.sha1); |
82 | hex = sha1_to_hex(commit->tree->object.sha1); |
83 | |
83 | |
84 | if (get_sha1_hex(hex, sha1)) { |
84 | if (get_sha1_hex(hex, sha1)) { |
85 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
85 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
86 | return; |
86 | return; |
87 | } |
87 | } |
88 | tree = parse_tree_indirect(sha1); |
88 | tree = parse_tree_indirect(sha1); |
89 | if (!tree) { |
89 | if (!tree) { |
90 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
90 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
91 | return; |
91 | return; |
92 | } |
92 | } |
93 | |
93 | |
94 | html_txt(path); |
94 | html_txt(path); |
95 | html("<table class='list'>\n"); |
95 | html("<table class='list'>\n"); |
96 | html("<tr class='nohover'>"); |
96 | html("<tr class='nohover'>"); |
|