Fossil SCM
Show the branch in the checkin description (artifact and file diff pages).
Commit
dad37196fb01c078cb477b8847a77a6043a266c6
Parent
65b729ac3117478…
1 file changed
+6
-1
+6
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -907,29 +907,34 @@ | ||
| 907 | 907 | static void checkin_description(int rid){ |
| 908 | 908 | Stmt q; |
| 909 | 909 | db_prepare(&q, |
| 910 | 910 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 911 | 911 | " coalesce(ecomment,comment), uuid," |
| 912 | + " coalesce((SELECT value FROM tagxref" | |
| 913 | + " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," | |
| 912 | 914 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 913 | 915 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 914 | 916 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 915 | 917 | " FROM event, blob" |
| 916 | 918 | " WHERE event.objid=%d AND type='ci'" |
| 917 | 919 | " AND blob.rid=%d", |
| 918 | - rid, rid | |
| 920 | + TAG_BRANCH, rid, rid | |
| 919 | 921 | ); |
| 920 | 922 | while( db_step(&q)==SQLITE_ROW ){ |
| 921 | 923 | const char *zDate = db_column_text(&q, 0); |
| 922 | 924 | const char *zUser = db_column_text(&q, 1); |
| 923 | 925 | const char *zUuid = db_column_text(&q, 3); |
| 926 | + const char *zBranch = db_column_text(&q, 4); | |
| 924 | 927 | const char *zTagList = db_column_text(&q, 4); |
| 925 | 928 | Blob comment; |
| 926 | 929 | int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS; |
| 927 | 930 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 928 | 931 | wikiFlags |= WIKI_NOBLOCK; |
| 929 | 932 | } |
| 930 | 933 | hyperlink_to_uuid(zUuid); |
| 934 | + @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> | |
| 935 | + @ %s(zBranch)</a> - | |
| 931 | 936 | blob_zero(&comment); |
| 932 | 937 | db_column_blob(&q, 2, &comment); |
| 933 | 938 | wiki_convert(&comment, 0, wikiFlags); |
| 934 | 939 | blob_reset(&comment); |
| 935 | 940 | @ (user: |
| 936 | 941 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -907,29 +907,34 @@ | |
| 907 | static void checkin_description(int rid){ |
| 908 | Stmt q; |
| 909 | db_prepare(&q, |
| 910 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 911 | " coalesce(ecomment,comment), uuid," |
| 912 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 913 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 914 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 915 | " FROM event, blob" |
| 916 | " WHERE event.objid=%d AND type='ci'" |
| 917 | " AND blob.rid=%d", |
| 918 | rid, rid |
| 919 | ); |
| 920 | while( db_step(&q)==SQLITE_ROW ){ |
| 921 | const char *zDate = db_column_text(&q, 0); |
| 922 | const char *zUser = db_column_text(&q, 1); |
| 923 | const char *zUuid = db_column_text(&q, 3); |
| 924 | const char *zTagList = db_column_text(&q, 4); |
| 925 | Blob comment; |
| 926 | int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS; |
| 927 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 928 | wikiFlags |= WIKI_NOBLOCK; |
| 929 | } |
| 930 | hyperlink_to_uuid(zUuid); |
| 931 | blob_zero(&comment); |
| 932 | db_column_blob(&q, 2, &comment); |
| 933 | wiki_convert(&comment, 0, wikiFlags); |
| 934 | blob_reset(&comment); |
| 935 | @ (user: |
| 936 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -907,29 +907,34 @@ | |
| 907 | static void checkin_description(int rid){ |
| 908 | Stmt q; |
| 909 | db_prepare(&q, |
| 910 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 911 | " coalesce(ecomment,comment), uuid," |
| 912 | " coalesce((SELECT value FROM tagxref" |
| 913 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," |
| 914 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 915 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 916 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 917 | " FROM event, blob" |
| 918 | " WHERE event.objid=%d AND type='ci'" |
| 919 | " AND blob.rid=%d", |
| 920 | TAG_BRANCH, rid, rid |
| 921 | ); |
| 922 | while( db_step(&q)==SQLITE_ROW ){ |
| 923 | const char *zDate = db_column_text(&q, 0); |
| 924 | const char *zUser = db_column_text(&q, 1); |
| 925 | const char *zUuid = db_column_text(&q, 3); |
| 926 | const char *zBranch = db_column_text(&q, 4); |
| 927 | const char *zTagList = db_column_text(&q, 4); |
| 928 | Blob comment; |
| 929 | int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS; |
| 930 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 931 | wikiFlags |= WIKI_NOBLOCK; |
| 932 | } |
| 933 | hyperlink_to_uuid(zUuid); |
| 934 | @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> |
| 935 | @ %s(zBranch)</a> - |
| 936 | blob_zero(&comment); |
| 937 | db_column_blob(&q, 2, &comment); |
| 938 | wiki_convert(&comment, 0, wikiFlags); |
| 939 | blob_reset(&comment); |
| 940 | @ (user: |
| 941 |