Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a new viewing mode called "Classic". The new "Classic" is the same as "Verbose" in the previous release. The "Verbose View" is now the same as "Compact" except that the check-in details are always expanded. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b900583c9609dffc28ecdb18fc2297f2 |
User & Date: | drh 2018-03-17 15:55:12.157 |
Context
2018-03-17
| ||
16:29 | Update the build-in SQLite to the latest 3.23.0 alpha ... (check-in: ea67a544 user: drh tags: trunk) | |
15:55 | Add a new viewing mode called "Classic". The new "Classic" is the same as "Verbose" in the previous release. The "Verbose View" is now the same as "Compact" except that the check-in details are always expanded. ... (check-in: b900583c user: drh tags: trunk) | |
2018-03-12
| ||
12:10 | Upstream cson patch to change f() decls to f(void) and rename internal symbols which collide with system/compiler symbols on HPUX and Solaris 11/Illumos. ... (check-in: 0d3425db user: stephan tags: trunk) | |
Changes
Changes to src/timeline.c.
︙ | ︙ | |||
89 90 91 92 93 94 95 | } } /* ** Allowed flags for the tmFlags argument to www_print_timeline */ #if INTERFACE | | | | | | | | | | | | | | | | | > | | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | } } /* ** Allowed flags for the tmFlags argument to www_print_timeline */ #if INTERFACE #define TIMELINE_ARTID 0x000001 /* Show artifact IDs on non-check-in lines */ #define TIMELINE_LEAFONLY 0x000002 /* Show "Leaf" but not "Merge", "Fork" etc */ #define TIMELINE_BRIEF 0x000004 /* Combine adjacent elements of same obj */ #define TIMELINE_GRAPH 0x000008 /* Compute a graph */ #define TIMELINE_DISJOINT 0x000010 /* Elements are not contiguous */ #define TIMELINE_FCHANGES 0x000020 /* Detail file changes */ #define TIMELINE_BRCOLOR 0x000040 /* Background color by branch name */ #define TIMELINE_UCOLOR 0x000080 /* Background color by user */ #define TIMELINE_FRENAMES 0x000100 /* Detail only file name changes */ #define TIMELINE_UNHIDE 0x000200 /* Unhide check-ins with "hidden" tag */ #define TIMELINE_SHOWRID 0x000400 /* Show RID values in addition to UUIDs */ #define TIMELINE_BISECT 0x000800 /* Show supplimental bisect information */ #define TIMELINE_COMPACT 0x001000 /* Use the "compact" view style */ #define TIMELINE_VERBOSE 0x002000 /* Use the "detailed" view style */ #define TIMELINE_MODERN 0x004000 /* Use the "modern" view style */ #define TIMELINE_COLUMNAR 0x008000 /* Use the "columns" view style */ #define TIMELINE_CLASSIC 0x010000 /* Use the "classic" view style */ #define TIMELINE_VIEWS 0x01f000 /* Mask for all of the view styles */ #define TIMELINE_NOSCROLL 0x100000 /* Don't scroll to the selection */ #define TIMELINE_FILEDIFF 0x200000 /* Show File differences, not ckin diffs */ #endif /* ** Hash a string and use the hash to determine a background color. */ char *hash_color(const char *z){ int i; /* Loop counter */ |
︙ | ︙ | |||
273 274 275 276 277 278 279 280 281 282 283 284 285 286 | } if( tmFlags & TIMELINE_COLUMNAR ){ zStyle = "Columnar"; }else if( tmFlags & TIMELINE_COMPACT ){ zStyle = "Compact"; }else if( tmFlags & TIMELINE_VERBOSE ){ zStyle = "Verbose"; }else{ zStyle = "Modern"; } zDateFmt = P("datefmt"); if( zDateFmt ) dateFormat = atoi(zDateFmt); if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); | > > | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | } if( tmFlags & TIMELINE_COLUMNAR ){ zStyle = "Columnar"; }else if( tmFlags & TIMELINE_COMPACT ){ zStyle = "Compact"; }else if( tmFlags & TIMELINE_VERBOSE ){ zStyle = "Verbose"; }else if( tmFlags & TIMELINE_CLASSIC ){ zStyle = "Classic"; }else{ zStyle = "Modern"; } zDateFmt = P("datefmt"); if( zDateFmt ) dateFormat = atoi(zDateFmt); if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); |
︙ | ︙ | |||
463 464 465 466 467 468 469 | db_bind_int(&bisectQuery, ":rid", rid); if( db_step(&bisectQuery)==SQLITE_ROW ){ @ <b>%s(db_column_text(&bisectQuery,1))</b> @ (%d(db_column_int(&bisectQuery,0))) } db_reset(&bisectQuery); } | | | | 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | db_bind_int(&bisectQuery, ":rid", rid); if( db_step(&bisectQuery)==SQLITE_ROW ){ @ <b>%s(db_column_text(&bisectQuery,1))</b> @ (%d(db_column_int(&bisectQuery,0))) } db_reset(&bisectQuery); } drawDetailEllipsis = (tmFlags & (TIMELINE_COMPACT))!=0; db_column_blob(pQuery, commentColumn, &comment); if( tmFlags & TIMELINE_COMPACT ){ @ <span class='timelineCompactComment' data-id='%d(rid)'> }else{ @ <span class='timeline%s(zStyle)Comment'> } if( (tmFlags & TIMELINE_CLASSIC)!=0 ){ if( zType[0]=='c' ){ hyperlink_to_uuid(zUuid); if( isLeaf ){ if( db_exists("SELECT 1 FROM tagxref" " WHERE rid=%d AND tagid=%d AND tagtype>0", rid, TAG_CLOSED) ){ @ <span class="timelineLeaf">Closed-Leaf:</span> |
︙ | ︙ | |||
547 548 549 550 551 552 553 | @ <td class="timelineDetailCell"> } } if( tmFlags & TIMELINE_COMPACT ){ cgi_printf("<span class='clutter' id='detail-%d'>",rid); } cgi_printf("<span class='timeline%sDetail'>", zStyle); | | | | 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 | @ <td class="timelineDetailCell"> } } if( tmFlags & TIMELINE_COMPACT ){ cgi_printf("<span class='clutter' id='detail-%d'>",rid); } cgi_printf("<span class='timeline%sDetail'>", zStyle); if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ cgi_printf("("); } if( (tmFlags & TIMELINE_CLASSIC)==0 ){ if( zType[0]=='c' ){ if( isLeaf ){ if( db_exists("SELECT 1 FROM tagxref" " WHERE rid=%d AND tagid=%d AND tagtype>0", rid, TAG_CLOSED) ){ @ <span class='timelineLeaf'>Closed-Leaf</span> }else{ |
︙ | ︙ | |||
623 624 625 626 627 628 629 | } } tag_private_status(rid); if( xExtra ){ xExtra(rid); } /* End timelineDetail */ | | | 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 | } } tag_private_status(rid); if( xExtra ){ xExtra(rid); } /* End timelineDetail */ if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ cgi_printf(")"); } if( tmFlags & TIMELINE_COMPACT ){ @ </span></span> }else{ @ </span> } |
︙ | ︙ | |||
1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 | */ int timeline_ss_cookie(void){ int tmFlags; switch( cookie_value("ss","m")[0] ){ case 'c': tmFlags = TIMELINE_COMPACT; break; case 'v': tmFlags = TIMELINE_VERBOSE; break; case 'j': tmFlags = TIMELINE_COLUMNAR; break; default: tmFlags = TIMELINE_MODERN; break; } return tmFlags; } /* ** Add the select/option box to the timeline submenu that is used to ** set the ss= parameter that determines the viewing mode. ** ** Return the TIMELINE_* value appropriate for the view-style. */ int timeline_ss_submenu(void){ static const char *azViewStyles[] = { "m", "Modern View", "c", "Compact View", "v", "Verbose View", | > > | | > | 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | */ int timeline_ss_cookie(void){ int tmFlags; switch( cookie_value("ss","m")[0] ){ case 'c': tmFlags = TIMELINE_COMPACT; break; case 'v': tmFlags = TIMELINE_VERBOSE; break; case 'j': tmFlags = TIMELINE_COLUMNAR; break; case 'x': tmFlags = TIMELINE_CLASSIC; break; default: tmFlags = TIMELINE_MODERN; break; } return tmFlags; } /* ** Add the select/option box to the timeline submenu that is used to ** set the ss= parameter that determines the viewing mode. ** ** Return the TIMELINE_* value appropriate for the view-style. */ int timeline_ss_submenu(void){ static const char *azViewStyles[] = { "m", "Modern View", "j", "Columnar View", "c", "Compact View", "v", "Verbose View", "x", "Classic View", }; cookie_link_parameter("ss","ss","m"); style_submenu_multichoice("ss", sizeof(azViewStyles)/(2*sizeof(azViewStyles[0])), azViewStyles, 0); return timeline_ss_cookie(); } /* ** If the zChng string is not NULL, then it should be a comma-separated ** list of glob patterns for filenames. Add an term to the WHERE clause ** for the SQL statement under construction that excludes any check-in that |
︙ | ︙ |