Fossil SCM
Adding back the branch telling at checkin info for vdiff.
Commit
e29d3822e9f060599c700a249cabda98cbc956cd
Parent
f4b082d464885b1…
1 file changed
+6
-1
+6
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -839,29 +839,34 @@ | ||
| 839 | 839 | static void checkin_description(int rid){ |
| 840 | 840 | Stmt q; |
| 841 | 841 | db_prepare(&q, |
| 842 | 842 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 843 | 843 | " coalesce(ecomment,comment), uuid," |
| 844 | + " coalesce((SELECT value FROM tagxref" | |
| 845 | + " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," | |
| 844 | 846 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 845 | 847 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 846 | 848 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 847 | 849 | " FROM event, blob" |
| 848 | 850 | " WHERE event.objid=%d AND type='ci'" |
| 849 | 851 | " AND blob.rid=%d", |
| 850 | - rid, rid | |
| 852 | + TAG_BRANCH, rid, rid | |
| 851 | 853 | ); |
| 852 | 854 | while( db_step(&q)==SQLITE_ROW ){ |
| 853 | 855 | const char *zDate = db_column_text(&q, 0); |
| 854 | 856 | const char *zUser = db_column_text(&q, 1); |
| 855 | 857 | const char *zUuid = db_column_text(&q, 3); |
| 858 | + const char *zBranch = db_column_text(&q, 4); | |
| 856 | 859 | const char *zTagList = db_column_text(&q, 4); |
| 857 | 860 | Blob comment; |
| 858 | 861 | int wikiFlags = WIKI_INLINE; |
| 859 | 862 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 860 | 863 | wikiFlags |= WIKI_NOBLOCK; |
| 861 | 864 | } |
| 862 | 865 | hyperlink_to_uuid(zUuid); |
| 866 | + @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> | |
| 867 | + @ %s(zBranch)</a> - | |
| 863 | 868 | blob_zero(&comment); |
| 864 | 869 | db_column_blob(&q, 2, &comment); |
| 865 | 870 | wiki_convert(&comment, 0, wikiFlags); |
| 866 | 871 | blob_reset(&comment); |
| 867 | 872 | @ (user: |
| 868 | 873 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -839,29 +839,34 @@ | |
| 839 | static void checkin_description(int rid){ |
| 840 | Stmt q; |
| 841 | db_prepare(&q, |
| 842 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 843 | " coalesce(ecomment,comment), uuid," |
| 844 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 845 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 846 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 847 | " FROM event, blob" |
| 848 | " WHERE event.objid=%d AND type='ci'" |
| 849 | " AND blob.rid=%d", |
| 850 | rid, rid |
| 851 | ); |
| 852 | while( db_step(&q)==SQLITE_ROW ){ |
| 853 | const char *zDate = db_column_text(&q, 0); |
| 854 | const char *zUser = db_column_text(&q, 1); |
| 855 | const char *zUuid = db_column_text(&q, 3); |
| 856 | const char *zTagList = db_column_text(&q, 4); |
| 857 | Blob comment; |
| 858 | int wikiFlags = WIKI_INLINE; |
| 859 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 860 | wikiFlags |= WIKI_NOBLOCK; |
| 861 | } |
| 862 | hyperlink_to_uuid(zUuid); |
| 863 | blob_zero(&comment); |
| 864 | db_column_blob(&q, 2, &comment); |
| 865 | wiki_convert(&comment, 0, wikiFlags); |
| 866 | blob_reset(&comment); |
| 867 | @ (user: |
| 868 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -839,29 +839,34 @@ | |
| 839 | static void checkin_description(int rid){ |
| 840 | Stmt q; |
| 841 | db_prepare(&q, |
| 842 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 843 | " coalesce(ecomment,comment), uuid," |
| 844 | " coalesce((SELECT value FROM tagxref" |
| 845 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," |
| 846 | " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" |
| 847 | " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" |
| 848 | " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" |
| 849 | " FROM event, blob" |
| 850 | " WHERE event.objid=%d AND type='ci'" |
| 851 | " AND blob.rid=%d", |
| 852 | TAG_BRANCH, rid, rid |
| 853 | ); |
| 854 | while( db_step(&q)==SQLITE_ROW ){ |
| 855 | const char *zDate = db_column_text(&q, 0); |
| 856 | const char *zUser = db_column_text(&q, 1); |
| 857 | const char *zUuid = db_column_text(&q, 3); |
| 858 | const char *zBranch = db_column_text(&q, 4); |
| 859 | const char *zTagList = db_column_text(&q, 4); |
| 860 | Blob comment; |
| 861 | int wikiFlags = WIKI_INLINE; |
| 862 | if( db_get_boolean("timeline-block-markup", 0)==0 ){ |
| 863 | wikiFlags |= WIKI_NOBLOCK; |
| 864 | } |
| 865 | hyperlink_to_uuid(zUuid); |
| 866 | @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> |
| 867 | @ %s(zBranch)</a> - |
| 868 | blob_zero(&comment); |
| 869 | db_column_blob(&q, 2, &comment); |
| 870 | wiki_convert(&comment, 0, wikiFlags); |
| 871 | blob_reset(&comment); |
| 872 | @ (user: |
| 873 |