Fossil SCM
Show the branch name in artifact descriptions.
Commit
2e38bed49e5ad601176fc99c2c05439e95ac5866
Parent
e55105e58f0b664…
1 file changed
+12
-2
+12
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -782,27 +782,30 @@ | ||
| 782 | 782 | |
| 783 | 783 | db_prepare(&q, |
| 784 | 784 | "SELECT filename.name, datetime(event.mtime)," |
| 785 | 785 | " coalesce(event.ecomment,event.comment)," |
| 786 | 786 | " coalesce(event.euser,event.user)," |
| 787 | - " b.uuid" | |
| 787 | + " b.uuid," | |
| 788 | + " coalesce((SELECT value FROM tagxref" | |
| 789 | + " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')" | |
| 788 | 790 | " FROM mlink, filename, event, blob a, blob b" |
| 789 | 791 | " WHERE filename.fnid=mlink.fnid" |
| 790 | 792 | " AND event.objid=mlink.mid" |
| 791 | 793 | " AND a.rid=mlink.fid" |
| 792 | 794 | " AND b.rid=mlink.mid" |
| 793 | 795 | " AND mlink.fid=%d" |
| 794 | 796 | " ORDER BY filename.name, event.mtime", |
| 795 | - rid | |
| 797 | + TAG_BRANCH, rid | |
| 796 | 798 | ); |
| 797 | 799 | @ <ul> |
| 798 | 800 | while( db_step(&q)==SQLITE_ROW ){ |
| 799 | 801 | const char *zName = db_column_text(&q, 0); |
| 800 | 802 | const char *zDate = db_column_text(&q, 1); |
| 801 | 803 | const char *zCom = db_column_text(&q, 2); |
| 802 | 804 | const char *zUser = db_column_text(&q, 3); |
| 803 | 805 | const char *zVers = db_column_text(&q, 4); |
| 806 | + const char *zBr = db_column_text(&q, 5); | |
| 804 | 807 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | 808 | if( prevName ) { |
| 806 | 809 | @ </ul> |
| 807 | 810 | } |
| 808 | 811 | @ <li>File |
| @@ -816,10 +819,17 @@ | ||
| 816 | 819 | } |
| 817 | 820 | @ <li> |
| 818 | 821 | hyperlink_to_date(zDate,""); |
| 819 | 822 | @ - part of checkin |
| 820 | 823 | hyperlink_to_uuid(zVers); |
| 824 | + if( zBr && zBr[0] ){ | |
| 825 | + if( g.okHistory ){ | |
| 826 | + @ on branch <a href="%s(g.zTop)/timeline?r=%T(zBr)">%h(zBr)</a> | |
| 827 | + }else{ | |
| 828 | + @ on branch %h(zBr) | |
| 829 | + } | |
| 830 | + } | |
| 821 | 831 | @ - %w(zCom) (user: |
| 822 | 832 | hyperlink_to_user(zUser,zDate,""); |
| 823 | 833 | @ ) |
| 824 | 834 | if( g.okHistory ){ |
| 825 | 835 | @ <a href="%s(g.zTop)/annotate?checkin=%S(zVers)&filename=%T(zName)"> |
| 826 | 836 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -782,27 +782,30 @@ | |
| 782 | |
| 783 | db_prepare(&q, |
| 784 | "SELECT filename.name, datetime(event.mtime)," |
| 785 | " coalesce(event.ecomment,event.comment)," |
| 786 | " coalesce(event.euser,event.user)," |
| 787 | " b.uuid" |
| 788 | " FROM mlink, filename, event, blob a, blob b" |
| 789 | " WHERE filename.fnid=mlink.fnid" |
| 790 | " AND event.objid=mlink.mid" |
| 791 | " AND a.rid=mlink.fid" |
| 792 | " AND b.rid=mlink.mid" |
| 793 | " AND mlink.fid=%d" |
| 794 | " ORDER BY filename.name, event.mtime", |
| 795 | rid |
| 796 | ); |
| 797 | @ <ul> |
| 798 | while( db_step(&q)==SQLITE_ROW ){ |
| 799 | const char *zName = db_column_text(&q, 0); |
| 800 | const char *zDate = db_column_text(&q, 1); |
| 801 | const char *zCom = db_column_text(&q, 2); |
| 802 | const char *zUser = db_column_text(&q, 3); |
| 803 | const char *zVers = db_column_text(&q, 4); |
| 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | if( prevName ) { |
| 806 | @ </ul> |
| 807 | } |
| 808 | @ <li>File |
| @@ -816,10 +819,17 @@ | |
| 816 | } |
| 817 | @ <li> |
| 818 | hyperlink_to_date(zDate,""); |
| 819 | @ - part of checkin |
| 820 | hyperlink_to_uuid(zVers); |
| 821 | @ - %w(zCom) (user: |
| 822 | hyperlink_to_user(zUser,zDate,""); |
| 823 | @ ) |
| 824 | if( g.okHistory ){ |
| 825 | @ <a href="%s(g.zTop)/annotate?checkin=%S(zVers)&filename=%T(zName)"> |
| 826 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -782,27 +782,30 @@ | |
| 782 | |
| 783 | db_prepare(&q, |
| 784 | "SELECT filename.name, datetime(event.mtime)," |
| 785 | " coalesce(event.ecomment,event.comment)," |
| 786 | " coalesce(event.euser,event.user)," |
| 787 | " b.uuid," |
| 788 | " coalesce((SELECT value FROM tagxref" |
| 789 | " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')" |
| 790 | " FROM mlink, filename, event, blob a, blob b" |
| 791 | " WHERE filename.fnid=mlink.fnid" |
| 792 | " AND event.objid=mlink.mid" |
| 793 | " AND a.rid=mlink.fid" |
| 794 | " AND b.rid=mlink.mid" |
| 795 | " AND mlink.fid=%d" |
| 796 | " ORDER BY filename.name, event.mtime", |
| 797 | TAG_BRANCH, rid |
| 798 | ); |
| 799 | @ <ul> |
| 800 | while( db_step(&q)==SQLITE_ROW ){ |
| 801 | const char *zName = db_column_text(&q, 0); |
| 802 | const char *zDate = db_column_text(&q, 1); |
| 803 | const char *zCom = db_column_text(&q, 2); |
| 804 | const char *zUser = db_column_text(&q, 3); |
| 805 | const char *zVers = db_column_text(&q, 4); |
| 806 | const char *zBr = db_column_text(&q, 5); |
| 807 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 808 | if( prevName ) { |
| 809 | @ </ul> |
| 810 | } |
| 811 | @ <li>File |
| @@ -816,10 +819,17 @@ | |
| 819 | } |
| 820 | @ <li> |
| 821 | hyperlink_to_date(zDate,""); |
| 822 | @ - part of checkin |
| 823 | hyperlink_to_uuid(zVers); |
| 824 | if( zBr && zBr[0] ){ |
| 825 | if( g.okHistory ){ |
| 826 | @ on branch <a href="%s(g.zTop)/timeline?r=%T(zBr)">%h(zBr)</a> |
| 827 | }else{ |
| 828 | @ on branch %h(zBr) |
| 829 | } |
| 830 | } |
| 831 | @ - %w(zCom) (user: |
| 832 | hyperlink_to_user(zUser,zDate,""); |
| 833 | @ ) |
| 834 | if( g.okHistory ){ |
| 835 | @ <a href="%s(g.zTop)/annotate?checkin=%S(zVers)&filename=%T(zName)"> |
| 836 |