Fossil SCM

In "Verbose" mode, put the hash up front, as was done with legacy.

drh 2017-11-29 03:41 UTC sticky-timeline-style
Commit 59980b6082f7ffe45b8e4f3a93a52058806a9b51da25b680908f1a449856f2d5
Parent 926a5a38df94e13…
1 file changed +46 -18
~ src/timeline.c
M src/timeline.c
+46 -18
--- src/timeline.c
+++ src/timeline.c
@@ -462,10 +462,36 @@
462462
 db_column_blob(pQuery, commentColumn, &comment);
463463
 if( tmFlags & TIMELINE_COMPACT ){
464464
 @ <span class='timelineCompactComment' onclick='toggleDetail(%d(rid))'>
465465
 }else{
466466
 @ <span class='timeline%s(zStyle)Comment'>
467
+ }
468
+ if( (tmFlags & TIMELINE_VERBOSE)!=0 ){
469
+ if( zType[0]=='c' ){
470
+ hyperlink_to_uuid(zUuid);
471
+ if( isLeaf ){
472
+ if( db_exists("SELECT 1 FROM tagxref"
473
+ " WHERE rid=%d AND tagid=%d AND tagtype>0",
474
+ rid, TAG_CLOSED) ){
475
+ @ <span class="timelineLeaf">Closed-Leaf:</span>
476
+ }else{
477
+ @ <span class="timelineLeaf">Leaf:</span>
478
+ }
479
+ }
480
+ }else if( zType[0]=='e' && tagid ){
481
+ hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
482
+ }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
483
+ hyperlink_to_uuid(zUuid);
484
+ }
485
+ if( tmFlags & TIMELINE_SHOWRID ){
486
+ int srcId = delta_source_rid(rid);
487
+ if( srcId ){
488
+ @ (%d(rid)&larr;%d(srcId))
489
+ }else{
490
+ @ (%d(rid))
491
+ }
492
+ }
467493
 }
468494
 if( zType[0]!='c' ){
469495
 /* Comments for anything other than a check-in are generated by
470496
 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
471497
 wiki_convert(&comment, 0, WIKI_INLINE);
@@ -515,28 +541,30 @@
515541
 if( tmFlags & TIMELINE_COMPACT ){
516542
 cgi_printf("<span class='clutter' id='detail-%d'>",rid);
517543
 }
518544
 cgi_printf("<span class='timeline%sDetail'>", zStyle);
519545
520
- if( zType[0]=='c' ){
521
- if( isLeaf ){
522
- if( db_exists("SELECT 1 FROM tagxref"
523
- " WHERE rid=%d AND tagid=%d AND tagtype>0",
524
- rid, TAG_CLOSED) ){
525
- @ <span class='timelineLeaf'>Closed-Leaf</span>
526
- }else{
527
- @ <span class='timelineLeaf'>Leaf</span>
528
- }
529
- }
530
- cgi_printf("check-in:&nbsp;");
531
- hyperlink_to_uuid(zUuid);
532
- }else if( zType[0]=='e' && tagid ){
533
- cgi_printf("technote:&nbsp;");
534
- hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
535
- }else{
536
- cgi_printf("artifact:&nbsp;");
537
- hyperlink_to_uuid(zUuid);
546
+ if( (tmFlags & TIMELINE_VERBOSE)==0 ){
547
+ if( zType[0]=='c' ){
548
+ if( isLeaf ){
549
+ if( db_exists("SELECT 1 FROM tagxref"
550
+ " WHERE rid=%d AND tagid=%d AND tagtype>0",
551
+ rid, TAG_CLOSED) ){
552
+ @ <span class='timelineLeaf'>Closed-Leaf</span>
553
+ }else{
554
+ @ <span class='timelineLeaf'>Leaf</span>
555
+ }
556
+ }
557
+ cgi_printf("check-in:&nbsp;");
558
+ hyperlink_to_uuid(zUuid);
559
+ }else if( zType[0]=='e' && tagid ){
560
+ cgi_printf("technote:&nbsp;");
561
+ hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
562
+ }else{
563
+ cgi_printf("artifact:&nbsp;");
564
+ hyperlink_to_uuid(zUuid);
565
+ }
538566
 }
539567
540568
 if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){
541569
 char *zLink = mprintf("%R/timeline?u=%h&c=%t&nd&n=200", zDispUser, zDate);
542570
 cgi_printf("user:&nbsp;%z%h</a>", href("%z",zLink), zDispUser);
543571
--- src/timeline.c
+++ src/timeline.c
@@ -462,10 +462,36 @@
462 db_column_blob(pQuery, commentColumn, &comment);
463 if( tmFlags & TIMELINE_COMPACT ){
464 @ <span class='timelineCompactComment' onclick='toggleDetail(%d(rid))'>
465 }else{
466 @ <span class='timeline%s(zStyle)Comment'>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
467 }
468 if( zType[0]!='c' ){
469 /* Comments for anything other than a check-in are generated by
470 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
471 wiki_convert(&comment, 0, WIKI_INLINE);
@@ -515,28 +541,30 @@
515 if( tmFlags & TIMELINE_COMPACT ){
516 cgi_printf("<span class='clutter' id='detail-%d'>",rid);
517 }
518 cgi_printf("<span class='timeline%sDetail'>", zStyle);
519
520 if( zType[0]=='c' ){
521 if( isLeaf ){
522 if( db_exists("SELECT 1 FROM tagxref"
523 " WHERE rid=%d AND tagid=%d AND tagtype>0",
524 rid, TAG_CLOSED) ){
525 @ <span class='timelineLeaf'>Closed-Leaf</span>
526 }else{
527 @ <span class='timelineLeaf'>Leaf</span>
528 }
529 }
530 cgi_printf("check-in:&nbsp;");
531 hyperlink_to_uuid(zUuid);
532 }else if( zType[0]=='e' && tagid ){
533 cgi_printf("technote:&nbsp;");
534 hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
535 }else{
536 cgi_printf("artifact:&nbsp;");
537 hyperlink_to_uuid(zUuid);
 
 
538 }
539
540 if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){
541 char *zLink = mprintf("%R/timeline?u=%h&c=%t&nd&n=200", zDispUser, zDate);
542 cgi_printf("user:&nbsp;%z%h</a>", href("%z",zLink), zDispUser);
543
--- src/timeline.c
+++ src/timeline.c
@@ -462,10 +462,36 @@
462 db_column_blob(pQuery, commentColumn, &comment);
463 if( tmFlags & TIMELINE_COMPACT ){
464 @ <span class='timelineCompactComment' onclick='toggleDetail(%d(rid))'>
465 }else{
466 @ <span class='timeline%s(zStyle)Comment'>
467 }
468 if( (tmFlags & TIMELINE_VERBOSE)!=0 ){
469 if( zType[0]=='c' ){
470 hyperlink_to_uuid(zUuid);
471 if( isLeaf ){
472 if( db_exists("SELECT 1 FROM tagxref"
473 " WHERE rid=%d AND tagid=%d AND tagtype>0",
474 rid, TAG_CLOSED) ){
475 @ <span class="timelineLeaf">Closed-Leaf:</span>
476 }else{
477 @ <span class="timelineLeaf">Leaf:</span>
478 }
479 }
480 }else if( zType[0]=='e' && tagid ){
481 hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
482 }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
483 hyperlink_to_uuid(zUuid);
484 }
485 if( tmFlags & TIMELINE_SHOWRID ){
486 int srcId = delta_source_rid(rid);
487 if( srcId ){
488 @ (%d(rid)&larr;%d(srcId))
489 }else{
490 @ (%d(rid))
491 }
492 }
493 }
494 if( zType[0]!='c' ){
495 /* Comments for anything other than a check-in are generated by
496 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
497 wiki_convert(&comment, 0, WIKI_INLINE);
@@ -515,28 +541,30 @@
541 if( tmFlags & TIMELINE_COMPACT ){
542 cgi_printf("<span class='clutter' id='detail-%d'>",rid);
543 }
544 cgi_printf("<span class='timeline%sDetail'>", zStyle);
545
546 if( (tmFlags & TIMELINE_VERBOSE)==0 ){
547 if( zType[0]=='c' ){
548 if( isLeaf ){
549 if( db_exists("SELECT 1 FROM tagxref"
550 " WHERE rid=%d AND tagid=%d AND tagtype>0",
551 rid, TAG_CLOSED) ){
552 @ <span class='timelineLeaf'>Closed-Leaf</span>
553 }else{
554 @ <span class='timelineLeaf'>Leaf</span>
555 }
556 }
557 cgi_printf("check-in:&nbsp;");
558 hyperlink_to_uuid(zUuid);
559 }else if( zType[0]=='e' && tagid ){
560 cgi_printf("technote:&nbsp;");
561 hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
562 }else{
563 cgi_printf("artifact:&nbsp;");
564 hyperlink_to_uuid(zUuid);
565 }
566 }
567
568 if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){
569 char *zLink = mprintf("%R/timeline?u=%h&c=%t&nd&n=200", zDispUser, zDate);
570 cgi_printf("user:&nbsp;%z%h</a>", href("%z",zLink), zDispUser);
571

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button