author | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:55:10 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:55:10 (UTC) |
commit | dd0f27eb36e737261b57d6ebcbd9fe20e559470d (patch) (unidiff) | |
tree | 4729ecc84e0b24b044131546ff39bdd55a6cd9a6 /ui-shared.c | |
parent | 47bae9f58d5ecae437767b8e7835b23ad1804d0b (diff) | |
parent | ac1f493b6bbc589327e9ba3303f112fcd323c6b6 (diff) | |
download | cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.zip cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.tar.gz cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.tar.bz2 |
Merge branch 'filter-refs'
* filter-refs:
Add links to the new refs page from summary page
Add support for refs view
Make cgit_print_branches()/cgit_print_tags() external
Add descriptions of summary-branches and summary-tags to cgitrc
Add support for config param summary-branches
Move logic for age comparision from cmp_tag_age into cmp_age()
Add support for config param summary-tags
Sort tags by age
Use reflist to print tag info
Use reflist to print branch info
Add functions and types for ref lists
-rw-r--r-- | ui-shared.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 5c5bcf3..e4bb98f 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -182,96 +182,102 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
182 | html("id="); | 182 | html("id="); |
183 | html_attr(rev); | 183 | html_attr(rev); |
184 | } | 184 | } |
185 | html("'>"); | 185 | html("'>"); |
186 | html_txt(name); | 186 | html_txt(name); |
187 | html("</a>"); | 187 | html("</a>"); |
188 | } | 188 | } |
189 | 189 | ||
190 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 190 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
191 | char *rev, char *path) | 191 | char *rev, char *path) |
192 | { | 192 | { |
193 | reporevlink("tree", name, title, class, head, rev, path); | 193 | reporevlink("tree", name, title, class, head, rev, path); |
194 | } | 194 | } |
195 | 195 | ||
196 | void cgit_log_link(char *name, char *title, char *class, char *head, | 196 | void cgit_log_link(char *name, char *title, char *class, char *head, |
197 | char *rev, char *path, int ofs) | 197 | char *rev, char *path, int ofs) |
198 | { | 198 | { |
199 | char *delim; | 199 | char *delim; |
200 | 200 | ||
201 | delim = repolink(title, class, "log", head, path); | 201 | delim = repolink(title, class, "log", head, path); |
202 | if (rev && strcmp(rev, cgit_query_head)) { | 202 | if (rev && strcmp(rev, cgit_query_head)) { |
203 | html(delim); | 203 | html(delim); |
204 | html("id="); | 204 | html("id="); |
205 | html_attr(rev); | 205 | html_attr(rev); |
206 | delim = "&"; | 206 | delim = "&"; |
207 | } | 207 | } |
208 | if (ofs > 0) { | 208 | if (ofs > 0) { |
209 | html(delim); | 209 | html(delim); |
210 | html("ofs="); | 210 | html("ofs="); |
211 | htmlf("%d", ofs); | 211 | htmlf("%d", ofs); |
212 | } | 212 | } |
213 | html("'>"); | 213 | html("'>"); |
214 | html_txt(name); | 214 | html_txt(name); |
215 | html("</a>"); | 215 | html("</a>"); |
216 | } | 216 | } |
217 | 217 | ||
218 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 218 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
219 | char *rev) | 219 | char *rev) |
220 | { | 220 | { |
221 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | 221 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { |
222 | name[cgit_max_msg_len] = '\0'; | 222 | name[cgit_max_msg_len] = '\0'; |
223 | name[cgit_max_msg_len - 1] = '.'; | 223 | name[cgit_max_msg_len - 1] = '.'; |
224 | name[cgit_max_msg_len - 2] = '.'; | 224 | name[cgit_max_msg_len - 2] = '.'; |
225 | name[cgit_max_msg_len - 3] = '.'; | 225 | name[cgit_max_msg_len - 3] = '.'; |
226 | } | 226 | } |
227 | reporevlink("commit", name, title, class, head, rev, NULL); | 227 | reporevlink("commit", name, title, class, head, rev, NULL); |
228 | } | 228 | } |
229 | 229 | ||
230 | void cgit_refs_link(char *name, char *title, char *class, char *head, | ||
231 | char *rev, char *path) | ||
232 | { | ||
233 | reporevlink("refs", name, title, class, head, rev, path); | ||
234 | } | ||
235 | |||
230 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 236 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
231 | char *rev, char *archivename) | 237 | char *rev, char *archivename) |
232 | { | 238 | { |
233 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 239 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
234 | } | 240 | } |
235 | 241 | ||
236 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 242 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
237 | char *new_rev, char *old_rev, char *path) | 243 | char *new_rev, char *old_rev, char *path) |
238 | { | 244 | { |
239 | char *delim; | 245 | char *delim; |
240 | 246 | ||
241 | delim = repolink(title, class, "diff", head, path); | 247 | delim = repolink(title, class, "diff", head, path); |
242 | if (new_rev && strcmp(new_rev, cgit_query_head)) { | 248 | if (new_rev && strcmp(new_rev, cgit_query_head)) { |
243 | html(delim); | 249 | html(delim); |
244 | html("id="); | 250 | html("id="); |
245 | html_attr(new_rev); | 251 | html_attr(new_rev); |
246 | delim = "&"; | 252 | delim = "&"; |
247 | } | 253 | } |
248 | if (old_rev) { | 254 | if (old_rev) { |
249 | html(delim); | 255 | html(delim); |
250 | html("id2="); | 256 | html("id2="); |
251 | html_attr(old_rev); | 257 | html_attr(old_rev); |
252 | } | 258 | } |
253 | html("'>"); | 259 | html("'>"); |
254 | html_txt(name); | 260 | html_txt(name); |
255 | html("</a>"); | 261 | html("</a>"); |
256 | } | 262 | } |
257 | 263 | ||
258 | void cgit_object_link(struct object *obj) | 264 | void cgit_object_link(struct object *obj) |
259 | { | 265 | { |
260 | char *page, *arg, *url; | 266 | char *page, *arg, *url; |
261 | 267 | ||
262 | if (obj->type == OBJ_COMMIT) { | 268 | if (obj->type == OBJ_COMMIT) { |
263 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 269 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
264 | cgit_query_head, sha1_to_hex(obj->sha1)); | 270 | cgit_query_head, sha1_to_hex(obj->sha1)); |
265 | return; | 271 | return; |
266 | } else if (obj->type == OBJ_TREE) { | 272 | } else if (obj->type == OBJ_TREE) { |
267 | page = "tree"; | 273 | page = "tree"; |
268 | arg = "id"; | 274 | arg = "id"; |
269 | } else { | 275 | } else { |
270 | page = "blob"; | 276 | page = "blob"; |
271 | arg = "id"; | 277 | arg = "id"; |
272 | } | 278 | } |
273 | 279 | ||
274 | url = cgit_pageurl(cgit_query_repo, page, | 280 | url = cgit_pageurl(cgit_query_repo, page, |
275 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 281 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
276 | html_link_open(url, NULL, NULL); | 282 | html_link_open(url, NULL, NULL); |
277 | htmlf("%s %s", typename(obj->type), | 283 | htmlf("%s %s", typename(obj->type), |