|
diff --git a/ui-tree.c b/ui-tree.c index cb57d8d..eb3d3ac 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,104 +1,214 @@ |
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 | char *match_path; |
| |
13 | int header = 0; |
12 | |
14 | |
13 | static int print_entry(const unsigned char *sha1, const char *base, |
15 | static void print_object(const unsigned char *sha1, char *path) |
14 | int baselen, const char *pathname, unsigned int mode, |
16 | { |
15 | int stage) |
17 | enum object_type type; |
| |
18 | unsigned char *buf; |
| |
19 | unsigned long size, lineno, start, idx; |
| |
20 | |
| |
21 | type = sha1_object_info(sha1, &size); |
| |
22 | if (type == OBJ_BAD) { |
| |
23 | cgit_print_error(fmt("Bad object name: %s", |
| |
24 | sha1_to_hex(sha1))); |
| |
25 | return; |
| |
26 | } |
| |
27 | |
| |
28 | buf = read_sha1_file(sha1, &type, &size); |
| |
29 | if (!buf) { |
| |
30 | cgit_print_error(fmt("Error reading object %s", |
| |
31 | sha1_to_hex(sha1))); |
| |
32 | return; |
| |
33 | } |
| |
34 | |
| |
35 | html("<table class='blob'>\n"); |
| |
36 | idx = 0; |
| |
37 | start = 0; |
| |
38 | lineno = 0; |
| |
39 | while(idx < size) { |
| |
40 | if (buf[idx] == '\n') { |
| |
41 | buf[idx] = '\0'; |
| |
42 | htmlf("<tr><td class='no'>%d</td><td class='txt'>", |
| |
43 | ++lineno); |
| |
44 | html_txt(buf + start); |
| |
45 | html("</td></tr>\n"); |
| |
46 | start = idx + 1; |
| |
47 | } |
| |
48 | idx++; |
| |
49 | } |
| |
50 | html("\n</td></tr>\n"); |
| |
51 | html("</table>\n"); |
| |
52 | } |
| |
53 | |
| |
54 | |
| |
55 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
| |
56 | const char *pathname, unsigned int mode, int stage) |
16 | { |
57 | { |
17 | char *name; |
58 | char *name; |
18 | enum object_type type; |
59 | enum object_type type; |
19 | unsigned long size = 0; |
60 | unsigned long size = 0; |
| |
61 | char *url, *qry; |
20 | |
62 | |
21 | name = xstrdup(pathname); |
63 | name = xstrdup(pathname); |
22 | type = sha1_object_info(sha1, &size); |
64 | type = sha1_object_info(sha1, &size); |
23 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
65 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
24 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
66 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
25 | name, |
67 | name, |
26 | sha1_to_hex(sha1)); |
68 | sha1_to_hex(sha1)); |
27 | return 0; |
69 | return 0; |
28 | } |
70 | } |
| |
71 | qry = fmt("h=%s&path=%s%s%s", curr_rev, |
| |
72 | cgit_query_path ? cgit_query_path : "", |
| |
73 | cgit_query_path ? "/" : "", pathname); |
| |
74 | url = cgit_pageurl(cgit_query_repo, "tree", qry); |
29 | html("<tr><td class='filemode'>"); |
75 | html("<tr><td class='filemode'>"); |
30 | html_filemode(mode); |
76 | html_filemode(mode); |
31 | html("</td><td "); |
77 | html("</td><td "); |
32 | if (S_ISDIRLNK(mode)) { |
78 | if (S_ISDIRLNK(mode)) { |
33 | htmlf("class='ls-mod'><a href='"); |
79 | htmlf("class='ls-mod'><a href='"); |
34 | html_attr(fmt(cgit_repo->module_link, |
80 | html_attr(fmt(cgit_repo->module_link, |
35 | name, |
81 | name, |
36 | sha1_to_hex(sha1))); |
82 | sha1_to_hex(sha1))); |
37 | } else if (S_ISDIR(mode)) { |
83 | } else if (S_ISDIR(mode)) { |
38 | html("class='ls-dir'><a href='"); |
84 | html("class='ls-dir'><a href='"); |
39 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
85 | html_attr(url); |
40 | fmt("h=%s&id=%s&path=%s%s/", |
| |
41 | curr_rev, |
| |
42 | sha1_to_hex(sha1), |
| |
43 | cgit_query_path ? cgit_query_path : "", |
| |
44 | pathname))); |
| |
45 | } else { |
86 | } else { |
46 | html("class='ls-blob'><a href='"); |
87 | html("class='ls-blob'><a href='"); |
47 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
88 | html_attr(url); |
48 | fmt("h=%s&id=%s&path=%s%s", curr_rev, |
| |
49 | sha1_to_hex(sha1), |
| |
50 | cgit_query_path ? cgit_query_path : "", |
| |
51 | pathname))); |
| |
52 | } |
89 | } |
53 | htmlf("'>%s</a></td>", name); |
90 | htmlf("'>%s</a></td>", name); |
54 | htmlf("<td class='filesize'>%li</td>", size); |
91 | htmlf("<td class='filesize'>%li</td>", size); |
55 | |
92 | |
56 | html("<td class='links'><a href='"); |
93 | html("<td class='links'><a href='"); |
57 | html_attr(cgit_pageurl(cgit_query_repo, "log", |
94 | qry = fmt("h=%s&path=%s%s%s", curr_rev, |
58 | fmt("h=%s&path=%s%s", |
95 | cgit_query_path ? cgit_query_path : "", |
59 | curr_rev, |
96 | cgit_query_path ? "/" : "", pathname); |
60 | cgit_query_path ? cgit_query_path : "", |
97 | url = cgit_pageurl(cgit_query_repo, "log", qry); |
61 | pathname))); |
98 | html_attr(url); |
62 | html("'>history</a></td>"); |
99 | html("' class='button'>H</a></td>"); |
63 | html("</tr>\n"); |
100 | html("</tr>\n"); |
64 | free(name); |
101 | free(name); |
65 | return 0; |
102 | return 0; |
66 | } |
103 | } |
67 | |
104 | |
68 | void cgit_print_tree(const char *rev, const char *hex, char *path) |
105 | static void ls_head() |
| |
106 | { |
| |
107 | html("<table class='list'>\n"); |
| |
108 | html("<tr class='nohover'>"); |
| |
109 | html("<th class='left'>Mode</th>"); |
| |
110 | html("<th class='left'>Name</th>"); |
| |
111 | html("<th class='right'>Size</th>"); |
| |
112 | html("<th/>"); |
| |
113 | html("</tr>\n"); |
| |
114 | header = 1; |
| |
115 | } |
| |
116 | |
| |
117 | static void ls_tail() |
| |
118 | { |
| |
119 | if (!header) |
| |
120 | return; |
| |
121 | html("</table>\n"); |
| |
122 | header = 0; |
| |
123 | } |
| |
124 | |
| |
125 | static void ls_tree(const unsigned char *sha1, char *path) |
69 | { |
126 | { |
70 | struct tree *tree; |
127 | struct tree *tree; |
| |
128 | |
| |
129 | tree = parse_tree_indirect(sha1); |
| |
130 | if (!tree) { |
| |
131 | cgit_print_error(fmt("Not a tree object: %s", |
| |
132 | sha1_to_hex(sha1))); |
| |
133 | return; |
| |
134 | } |
| |
135 | |
| |
136 | ls_head(); |
| |
137 | read_tree_recursive(tree, "", 0, 1, NULL, ls_item); |
| |
138 | ls_tail(); |
| |
139 | } |
| |
140 | |
| |
141 | |
| |
142 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
| |
143 | const char *pathname, unsigned mode, int stage) |
| |
144 | { |
| |
145 | static int state; |
| |
146 | static char buffer[PATH_MAX]; |
| |
147 | char *url; |
| |
148 | |
| |
149 | if (state == 0) { |
| |
150 | memcpy(buffer, base, baselen); |
| |
151 | strcpy(buffer+baselen, pathname); |
| |
152 | url = cgit_pageurl(cgit_query_repo, "tree", |
| |
153 | fmt("h=%s&path=%s", curr_rev, buffer)); |
| |
154 | htmlf(" / <a href='"); |
| |
155 | html_attr(url); |
| |
156 | html("'>"); |
| |
157 | html_txt(xstrdup(pathname)); |
| |
158 | html("</a>"); |
| |
159 | |
| |
160 | if (strcmp(match_path, buffer)) |
| |
161 | return READ_TREE_RECURSIVE; |
| |
162 | |
| |
163 | if (S_ISDIR(mode)) { |
| |
164 | state = 1; |
| |
165 | ls_head(); |
| |
166 | return READ_TREE_RECURSIVE; |
| |
167 | } else { |
| |
168 | print_object(sha1, buffer); |
| |
169 | return 0; |
| |
170 | } |
| |
171 | } |
| |
172 | ls_item(sha1, base, baselen, pathname, mode, stage); |
| |
173 | return 0; |
| |
174 | } |
| |
175 | |
| |
176 | |
| |
177 | /* |
| |
178 | * Show a tree or a blob |
| |
179 | * rev: the commit pointing at the root tree object |
| |
180 | * path: path to tree or blob |
| |
181 | */ |
| |
182 | void cgit_print_tree(const char *rev, char *path) |
| |
183 | { |
71 | unsigned char sha1[20]; |
184 | unsigned char sha1[20]; |
72 | struct commit *commit; |
185 | struct commit *commit; |
| |
186 | const char *paths[] = {path, NULL}; |
| |
187 | |
| |
188 | if (!rev) |
| |
189 | rev = cgit_query_head; |
73 | |
190 | |
74 | curr_rev = xstrdup(rev); |
191 | curr_rev = xstrdup(rev); |
75 | get_sha1(rev, sha1); |
192 | if (get_sha1(rev, sha1)) { |
| |
193 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
| |
194 | return; |
| |
195 | } |
76 | commit = lookup_commit_reference(sha1); |
196 | commit = lookup_commit_reference(sha1); |
77 | if (!commit || parse_commit(commit)) { |
197 | if (!commit || parse_commit(commit)) { |
78 | cgit_print_error(fmt("Invalid head: %s", rev)); |
198 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
79 | return; |
199 | return; |
80 | } |
200 | } |
81 | if (!hex) |
| |
82 | hex = sha1_to_hex(commit->tree->object.sha1); |
| |
83 | |
201 | |
84 | if (get_sha1_hex(hex, sha1)) { |
202 | html("path: <a href='"); |
85 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
203 | html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev))); |
86 | return; |
204 | html("'>root</a>"); |
87 | } |
205 | |
88 | tree = parse_tree_indirect(sha1); |
206 | if (path == NULL) { |
89 | if (!tree) { |
207 | ls_tree(commit->tree->object.sha1, NULL); |
90 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
| |
91 | return; |
208 | return; |
92 | } |
209 | } |
93 | |
210 | |
94 | html_txt(path); |
211 | match_path = path; |
95 | html("<table class='list'>\n"); |
212 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
96 | html("<tr class='nohover'>"); |
213 | ls_tail(); |
97 | html("<th class='left'>Mode</th>"); |
| |
98 | html("<th class='left'>Name</th>"); |
| |
99 | html("<th class='right'>Size</th>"); |
| |
100 | html("<th/>"); |
| |
101 | html("</tr>\n"); |
| |
102 | read_tree_recursive(tree, "", 0, 1, NULL, print_entry); |
| |
103 | html("</table>\n"); |
| |
104 | } |
214 | } |
|