Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch viric_showbranch Excluding Merge-Ins
This is equivalent to a diff from 65b729ac31 to dad37196fb
|
2015-02-09
| ||
| 11:00 | viric's flavour of fossil, which includes the cherry-picked changes out of trunk: [d0b1b1114] [39e165afb] [dad37196f] [f309130a8]. This outdates the branch annotate_links ([f14798e0e3]), which has some extra changes, some hard to port. This lets the browser pick the right program to open them straight. Leaf check-in: b31afcc2ca user: viriketo tags: viric_flavour | |
| 10:39 | Fixing parentheses closing in the finfo page. check-in: 042ec2b9c3 user: viriketo tags: trunk | |
| 10:37 | Show the branch in the checkin description (artifact and file diff pages). Leaf check-in: dad37196fb user: viriketo tags: viric_showbranch | |
| 10:30 | New way to calculate the automatic branch colours. It's a matter of taste, but I prefer this way; the colours often become more different. Leaf check-in: 39e165afb3 user: viriketo tags: viric_newcolours | |
| 10:13 | Omit unused c= parameters from hyperlinks in the /timeline. check-in: 65b729ac31 user: drh tags: trunk | |
| 04:46 | Add the "Context" subsection to the /info page for check-ins that shows a graph of all immediate ancestors and descendents of the check-in. check-in: b709be6517 user: drh tags: trunk | |
Changes to src/info.c.
| ︙ | ︙ | |||
905 906 907 908 909 910 911 912 913 914 915 916 917 |
** Output a description of a check-in
*/
static void checkin_description(int rid){
Stmt q;
db_prepare(&q,
"SELECT datetime(mtime), coalesce(euser,user),"
" coalesce(ecomment,comment), uuid,"
" (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref"
" WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid"
" AND tagxref.rid=blob.rid AND tagxref.tagtype>0)"
" FROM event, blob"
" WHERE event.objid=%d AND type='ci'"
" AND blob.rid=%d",
| > > | > > > | 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 |
** Output a description of a check-in
*/
static void checkin_description(int rid){
Stmt q;
db_prepare(&q,
"SELECT datetime(mtime), coalesce(euser,user),"
" coalesce(ecomment,comment), uuid,"
" coalesce((SELECT value FROM tagxref"
" WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk'),"
" (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref"
" WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid"
" AND tagxref.rid=blob.rid AND tagxref.tagtype>0)"
" FROM event, blob"
" WHERE event.objid=%d AND type='ci'"
" AND blob.rid=%d",
TAG_BRANCH, rid, rid
);
while( db_step(&q)==SQLITE_ROW ){
const char *zDate = db_column_text(&q, 0);
const char *zUser = db_column_text(&q, 1);
const char *zUuid = db_column_text(&q, 3);
const char *zBranch = db_column_text(&q, 4);
const char *zTagList = db_column_text(&q, 4);
Blob comment;
int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS;
if( db_get_boolean("timeline-block-markup", 0)==0 ){
wikiFlags |= WIKI_NOBLOCK;
}
hyperlink_to_uuid(zUuid);
@ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)">
@ %s(zBranch)</a> -
blob_zero(&comment);
db_column_blob(&q, 2, &comment);
wiki_convert(&comment, 0, wikiFlags);
blob_reset(&comment);
@ (user:
hyperlink_to_user(zUser,zDate,",");
if( zTagList && zTagList[0] && g.perm.Hyperlink ){
|
| ︙ | ︙ |