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