summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2007-12-02 21:11:35 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-12-02 21:27:07 (UTC)
commitfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (patch) (unidiff)
treeb45ed1a2e08360977df3c4a7c1dc5af32dae2751 /ui-shared.c
parent5b75064a81f9fe8f8a446a4be050fe3dfcf52b89 (diff)
downloadcgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.zip
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.gz
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.bz2
Handle missing timestamp in commit/tag objects
When a commit or tag lacks author/committer/tagger timestamp, do not skip the next line in the commit/tag object. Also, do not bother to print timestamps with value 0 as it is close to certain to be bogus. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..4944dfd 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -179,265 +179,269 @@ static void reporevlink(char *page, char *name, char *title, char *class,
179 char *delim; 179 char *delim;
180 180
181 delim = repolink(title, class, page, head, path); 181 delim = repolink(title, class, page, head, path);
182 if (rev && strcmp(rev, cgit_query_head)) { 182 if (rev && strcmp(rev, cgit_query_head)) {
183 html(delim); 183 html(delim);
184 html("id="); 184 html("id=");
185 html_attr(rev); 185 html_attr(rev);
186 } 186 }
187 html("'>"); 187 html("'>");
188 html_txt(name); 188 html_txt(name);
189 html("</a>"); 189 html("</a>");
190} 190}
191 191
192void cgit_tree_link(char *name, char *title, char *class, char *head, 192void cgit_tree_link(char *name, char *title, char *class, char *head,
193 char *rev, char *path) 193 char *rev, char *path)
194{ 194{
195 reporevlink("tree", name, title, class, head, rev, path); 195 reporevlink("tree", name, title, class, head, rev, path);
196} 196}
197 197
198void cgit_log_link(char *name, char *title, char *class, char *head, 198void cgit_log_link(char *name, char *title, char *class, char *head,
199 char *rev, char *path, int ofs, char *grep, char *pattern) 199 char *rev, char *path, int ofs, char *grep, char *pattern)
200{ 200{
201 char *delim; 201 char *delim;
202 202
203 delim = repolink(title, class, "log", head, path); 203 delim = repolink(title, class, "log", head, path);
204 if (rev && strcmp(rev, cgit_query_head)) { 204 if (rev && strcmp(rev, cgit_query_head)) {
205 html(delim); 205 html(delim);
206 html("id="); 206 html("id=");
207 html_attr(rev); 207 html_attr(rev);
208 delim = "&"; 208 delim = "&";
209 } 209 }
210 if (grep && pattern) { 210 if (grep && pattern) {
211 html(delim); 211 html(delim);
212 html("qt="); 212 html("qt=");
213 html_attr(grep); 213 html_attr(grep);
214 delim = "&"; 214 delim = "&";
215 html(delim); 215 html(delim);
216 html("q="); 216 html("q=");
217 html_attr(pattern); 217 html_attr(pattern);
218 } 218 }
219 if (ofs > 0) { 219 if (ofs > 0) {
220 html(delim); 220 html(delim);
221 html("ofs="); 221 html("ofs=");
222 htmlf("%d", ofs); 222 htmlf("%d", ofs);
223 } 223 }
224 html("'>"); 224 html("'>");
225 html_txt(name); 225 html_txt(name);
226 html("</a>"); 226 html("</a>");
227} 227}
228 228
229void cgit_commit_link(char *name, char *title, char *class, char *head, 229void cgit_commit_link(char *name, char *title, char *class, char *head,
230 char *rev) 230 char *rev)
231{ 231{
232 if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { 232 if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
233 name[cgit_max_msg_len] = '\0'; 233 name[cgit_max_msg_len] = '\0';
234 name[cgit_max_msg_len - 1] = '.'; 234 name[cgit_max_msg_len - 1] = '.';
235 name[cgit_max_msg_len - 2] = '.'; 235 name[cgit_max_msg_len - 2] = '.';
236 name[cgit_max_msg_len - 3] = '.'; 236 name[cgit_max_msg_len - 3] = '.';
237 } 237 }
238 reporevlink("commit", name, title, class, head, rev, NULL); 238 reporevlink("commit", name, title, class, head, rev, NULL);
239} 239}
240 240
241void cgit_refs_link(char *name, char *title, char *class, char *head, 241void cgit_refs_link(char *name, char *title, char *class, char *head,
242 char *rev, char *path) 242 char *rev, char *path)
243{ 243{
244 reporevlink("refs", name, title, class, head, rev, path); 244 reporevlink("refs", name, title, class, head, rev, path);
245} 245}
246 246
247void cgit_snapshot_link(char *name, char *title, char *class, char *head, 247void cgit_snapshot_link(char *name, char *title, char *class, char *head,
248 char *rev, char *archivename) 248 char *rev, char *archivename)
249{ 249{
250 reporevlink("snapshot", name, title, class, head, rev, archivename); 250 reporevlink("snapshot", name, title, class, head, rev, archivename);
251} 251}
252 252
253void cgit_diff_link(char *name, char *title, char *class, char *head, 253void cgit_diff_link(char *name, char *title, char *class, char *head,
254 char *new_rev, char *old_rev, char *path) 254 char *new_rev, char *old_rev, char *path)
255{ 255{
256 char *delim; 256 char *delim;
257 257
258 delim = repolink(title, class, "diff", head, path); 258 delim = repolink(title, class, "diff", head, path);
259 if (new_rev && strcmp(new_rev, cgit_query_head)) { 259 if (new_rev && strcmp(new_rev, cgit_query_head)) {
260 html(delim); 260 html(delim);
261 html("id="); 261 html("id=");
262 html_attr(new_rev); 262 html_attr(new_rev);
263 delim = "&amp;"; 263 delim = "&amp;";
264 } 264 }
265 if (old_rev) { 265 if (old_rev) {
266 html(delim); 266 html(delim);
267 html("id2="); 267 html("id2=");
268 html_attr(old_rev); 268 html_attr(old_rev);
269 } 269 }
270 html("'>"); 270 html("'>");
271 html_txt(name); 271 html_txt(name);
272 html("</a>"); 272 html("</a>");
273} 273}
274 274
275void cgit_object_link(struct object *obj) 275void cgit_object_link(struct object *obj)
276{ 276{
277 char *page, *arg, *url; 277 char *page, *arg, *url;
278 278
279 if (obj->type == OBJ_COMMIT) { 279 if (obj->type == OBJ_COMMIT) {
280 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, 280 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
281 cgit_query_head, sha1_to_hex(obj->sha1)); 281 cgit_query_head, sha1_to_hex(obj->sha1));
282 return; 282 return;
283 } else if (obj->type == OBJ_TREE) { 283 } else if (obj->type == OBJ_TREE) {
284 page = "tree"; 284 page = "tree";
285 arg = "id"; 285 arg = "id";
286 } else if (obj->type == OBJ_TAG) { 286 } else if (obj->type == OBJ_TAG) {
287 page = "tag"; 287 page = "tag";
288 arg = "id"; 288 arg = "id";
289 } else { 289 } else {
290 page = "blob"; 290 page = "blob";
291 arg = "id"; 291 arg = "id";
292 } 292 }
293 293
294 url = cgit_pageurl(cgit_query_repo, page, 294 url = cgit_pageurl(cgit_query_repo, page,
295 fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); 295 fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
296 html_link_open(url, NULL, NULL); 296 html_link_open(url, NULL, NULL);
297 htmlf("%s %s", typename(obj->type), 297 htmlf("%s %s", typename(obj->type),
298 sha1_to_hex(obj->sha1)); 298 sha1_to_hex(obj->sha1));
299 html_link_close(); 299 html_link_close();
300} 300}
301 301
302void cgit_print_date(time_t secs, char *format) 302void cgit_print_date(time_t secs, char *format)
303{ 303{
304 char buf[64]; 304 char buf[64];
305 struct tm *time; 305 struct tm *time;
306 306
307 if (!secs)
308 return;
307 time = gmtime(&secs); 309 time = gmtime(&secs);
308 strftime(buf, sizeof(buf)-1, format, time); 310 strftime(buf, sizeof(buf)-1, format, time);
309 html_txt(buf); 311 html_txt(buf);
310} 312}
311 313
312void cgit_print_age(time_t t, time_t max_relative, char *format) 314void cgit_print_age(time_t t, time_t max_relative, char *format)
313{ 315{
314 time_t now, secs; 316 time_t now, secs;
315 317
318 if (!t)
319 return;
316 time(&now); 320 time(&now);
317 secs = now - t; 321 secs = now - t;
318 322
319 if (secs > max_relative && max_relative >= 0) { 323 if (secs > max_relative && max_relative >= 0) {
320 cgit_print_date(t, format); 324 cgit_print_date(t, format);
321 return; 325 return;
322 } 326 }
323 327
324 if (secs < TM_HOUR * 2) { 328 if (secs < TM_HOUR * 2) {
325 htmlf("<span class='age-mins'>%.0f min.</span>", 329 htmlf("<span class='age-mins'>%.0f min.</span>",
326 secs * 1.0 / TM_MIN); 330 secs * 1.0 / TM_MIN);
327 return; 331 return;
328 } 332 }
329 if (secs < TM_DAY * 2) { 333 if (secs < TM_DAY * 2) {
330 htmlf("<span class='age-hours'>%.0f hours</span>", 334 htmlf("<span class='age-hours'>%.0f hours</span>",
331 secs * 1.0 / TM_HOUR); 335 secs * 1.0 / TM_HOUR);
332 return; 336 return;
333 } 337 }
334 if (secs < TM_WEEK * 2) { 338 if (secs < TM_WEEK * 2) {
335 htmlf("<span class='age-days'>%.0f days</span>", 339 htmlf("<span class='age-days'>%.0f days</span>",
336 secs * 1.0 / TM_DAY); 340 secs * 1.0 / TM_DAY);
337 return; 341 return;
338 } 342 }
339 if (secs < TM_MONTH * 2) { 343 if (secs < TM_MONTH * 2) {
340 htmlf("<span class='age-weeks'>%.0f weeks</span>", 344 htmlf("<span class='age-weeks'>%.0f weeks</span>",
341 secs * 1.0 / TM_WEEK); 345 secs * 1.0 / TM_WEEK);
342 return; 346 return;
343 } 347 }
344 if (secs < TM_YEAR * 2) { 348 if (secs < TM_YEAR * 2) {
345 htmlf("<span class='age-months'>%.0f months</span>", 349 htmlf("<span class='age-months'>%.0f months</span>",
346 secs * 1.0 / TM_MONTH); 350 secs * 1.0 / TM_MONTH);
347 return; 351 return;
348 } 352 }
349 htmlf("<span class='age-years'>%.0f years</span>", 353 htmlf("<span class='age-years'>%.0f years</span>",
350 secs * 1.0 / TM_YEAR); 354 secs * 1.0 / TM_YEAR);
351} 355}
352 356
353void cgit_print_docstart(char *title, struct cacheitem *item) 357void cgit_print_docstart(char *title, struct cacheitem *item)
354{ 358{
355 html("Content-Type: text/html; charset=utf-8\n"); 359 html("Content-Type: text/html; charset=utf-8\n");
356 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 360 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
357 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 361 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
358 ttl_seconds(item->ttl))); 362 ttl_seconds(item->ttl)));
359 html("\n"); 363 html("\n");
360 html(cgit_doctype); 364 html(cgit_doctype);
361 html("<html>\n"); 365 html("<html>\n");
362 html("<head>\n"); 366 html("<head>\n");
363 html("<title>"); 367 html("<title>");
364 html_txt(title); 368 html_txt(title);
365 html("</title>\n"); 369 html("</title>\n");
366 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 370 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
367 html("<link rel='stylesheet' type='text/css' href='"); 371 html("<link rel='stylesheet' type='text/css' href='");
368 html_attr(cgit_css); 372 html_attr(cgit_css);
369 html("'/>\n"); 373 html("'/>\n");
370 html("</head>\n"); 374 html("</head>\n");
371 html("<body>\n"); 375 html("<body>\n");
372} 376}
373 377
374void cgit_print_docend() 378void cgit_print_docend()
375{ 379{
376 html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); 380 html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
377} 381}
378 382
379int print_branch_option(const char *refname, const unsigned char *sha1, 383int print_branch_option(const char *refname, const unsigned char *sha1,
380 int flags, void *cb_data) 384 int flags, void *cb_data)
381{ 385{
382 char *name = (char *)refname; 386 char *name = (char *)refname;
383 html_option(name, name, cgit_query_head); 387 html_option(name, name, cgit_query_head);
384 return 0; 388 return 0;
385} 389}
386 390
387int print_archive_ref(const char *refname, const unsigned char *sha1, 391int print_archive_ref(const char *refname, const unsigned char *sha1,
388 int flags, void *cb_data) 392 int flags, void *cb_data)
389{ 393{
390 struct tag *tag; 394 struct tag *tag;
391 struct taginfo *info; 395 struct taginfo *info;
392 struct object *obj; 396 struct object *obj;
393 char buf[256], *url; 397 char buf[256], *url;
394 unsigned char fileid[20]; 398 unsigned char fileid[20];
395 int *header = (int *)cb_data; 399 int *header = (int *)cb_data;
396 400
397 if (prefixcmp(refname, "refs/archives")) 401 if (prefixcmp(refname, "refs/archives"))
398 return 0; 402 return 0;
399 strncpy(buf, refname+14, sizeof(buf)); 403 strncpy(buf, refname+14, sizeof(buf));
400 obj = parse_object(sha1); 404 obj = parse_object(sha1);
401 if (!obj) 405 if (!obj)
402 return 1; 406 return 1;
403 if (obj->type == OBJ_TAG) { 407 if (obj->type == OBJ_TAG) {
404 tag = lookup_tag(sha1); 408 tag = lookup_tag(sha1);
405 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 409 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
406 return 0; 410 return 0;
407 hashcpy(fileid, tag->tagged->sha1); 411 hashcpy(fileid, tag->tagged->sha1);
408 } else if (obj->type != OBJ_BLOB) { 412 } else if (obj->type != OBJ_BLOB) {
409 return 0; 413 return 0;
410 } else { 414 } else {
411 hashcpy(fileid, sha1); 415 hashcpy(fileid, sha1);
412 } 416 }
413 if (!*header) { 417 if (!*header) {
414 html("<p><h1>download</h1>"); 418 html("<p><h1>download</h1>");
415 *header = 1; 419 *header = 1;
416 } 420 }
417 url = cgit_pageurl(cgit_query_repo, "blob", 421 url = cgit_pageurl(cgit_query_repo, "blob",
418 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 422 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
419 buf)); 423 buf));
420 html_link_open(url, NULL, "menu"); 424 html_link_open(url, NULL, "menu");
421 html_txt(strlpart(buf, 20)); 425 html_txt(strlpart(buf, 20));
422 html_link_close(); 426 html_link_close();
423 return 0; 427 return 0;
424} 428}
425 429
426void add_hidden_formfields(int incl_head, int incl_search, char *page) 430void add_hidden_formfields(int incl_head, int incl_search, char *page)
427{ 431{
428 char *url; 432 char *url;
429 433
430 if (!cgit_virtual_root) { 434 if (!cgit_virtual_root) {
431 url = fmt("%s/%s", cgit_query_repo, page); 435 url = fmt("%s/%s", cgit_query_repo, page);
432 if (cgit_query_path) 436 if (cgit_query_path)
433 url = fmt("%s/%s", url, cgit_query_path); 437 url = fmt("%s/%s", url, cgit_query_path);
434 html_hidden("url", url); 438 html_hidden("url", url);
435 } 439 }
436 440
437 if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) 441 if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
438 html_hidden("h", cgit_query_head); 442 html_hidden("h", cgit_query_head);
439 443
440 if (cgit_query_sha1) 444 if (cgit_query_sha1)
441 html_hidden("id", cgit_query_sha1); 445 html_hidden("id", cgit_query_sha1);
442 if (cgit_query_sha2) 446 if (cgit_query_sha2)
443 html_hidden("id2", cgit_query_sha2); 447 html_hidden("id2", cgit_query_sha2);