Fossil SCM
In the artifact description generator, include the branch name and commit user in the description of check-in artifacts.
Commit
2ae6b1cc014cdbb8f3b0a62cd1b9f64b525ef749a8dce1722b92c49ce7d7ffe3
Parent
8c50f807b73e3d4…
1 file changed
+6
-2
+6
-2
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -1057,15 +1057,19 @@ | ||
| 1057 | 1057 | |
| 1058 | 1058 | /* Describe check-ins */ |
| 1059 | 1059 | db_multi_exec( |
| 1060 | 1060 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1061 | 1061 | "SELECT blob.rid, blob.uuid, blob.rcvid, event.mtime, 'checkin',\n" |
| 1062 | - " 'check-in on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n" | |
| 1062 | + " 'check-in to '\n" | |
| 1063 | + " || coalesce((SELECT value FROM tagxref WHERE tagid=%d" | |
| 1064 | + " AND tagtype>0 AND tagxref.rid=blob.rid),'trunk')\n" | |
| 1065 | + " || ' by ' || coalesce(event.euser,event.user)\n" | |
| 1066 | + " || ' on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n" | |
| 1063 | 1067 | " FROM event, blob\n" |
| 1064 | 1068 | " WHERE (event.objid %s) AND event.type='ci'\n" |
| 1065 | 1069 | " AND event.objid=blob.rid;", |
| 1066 | - zWhere /*safe-for-%s*/ | |
| 1070 | + TAG_BRANCH, zWhere /*safe-for-%s*/ | |
| 1067 | 1071 | ); |
| 1068 | 1072 | |
| 1069 | 1073 | /* Describe files */ |
| 1070 | 1074 | db_multi_exec( |
| 1071 | 1075 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1072 | 1076 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -1057,15 +1057,19 @@ | |
| 1057 | |
| 1058 | /* Describe check-ins */ |
| 1059 | db_multi_exec( |
| 1060 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1061 | "SELECT blob.rid, blob.uuid, blob.rcvid, event.mtime, 'checkin',\n" |
| 1062 | " 'check-in on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n" |
| 1063 | " FROM event, blob\n" |
| 1064 | " WHERE (event.objid %s) AND event.type='ci'\n" |
| 1065 | " AND event.objid=blob.rid;", |
| 1066 | zWhere /*safe-for-%s*/ |
| 1067 | ); |
| 1068 | |
| 1069 | /* Describe files */ |
| 1070 | db_multi_exec( |
| 1071 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1072 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -1057,15 +1057,19 @@ | |
| 1057 | |
| 1058 | /* Describe check-ins */ |
| 1059 | db_multi_exec( |
| 1060 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1061 | "SELECT blob.rid, blob.uuid, blob.rcvid, event.mtime, 'checkin',\n" |
| 1062 | " 'check-in to '\n" |
| 1063 | " || coalesce((SELECT value FROM tagxref WHERE tagid=%d" |
| 1064 | " AND tagtype>0 AND tagxref.rid=blob.rid),'trunk')\n" |
| 1065 | " || ' by ' || coalesce(event.euser,event.user)\n" |
| 1066 | " || ' on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n" |
| 1067 | " FROM event, blob\n" |
| 1068 | " WHERE (event.objid %s) AND event.type='ci'\n" |
| 1069 | " AND event.objid=blob.rid;", |
| 1070 | TAG_BRANCH, zWhere /*safe-for-%s*/ |
| 1071 | ); |
| 1072 | |
| 1073 | /* Describe files */ |
| 1074 | db_multi_exec( |
| 1075 | "INSERT OR IGNORE INTO description(rid,uuid,rcvid,ctime,type,summary)\n" |
| 1076 |