Fossil SCM
Show the branch of the checkin in the vdiff page.
Commit
a50a28bb3f8359bab8abb4d5e5d6cf4bf00c8a8a
Parent
75b4676c51dad3a…
1 file changed
+9
-5
+9
-5
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -736,26 +736,30 @@ | ||
| 736 | 736 | ** Output a description of a check-in |
| 737 | 737 | */ |
| 738 | 738 | void checkin_description(int rid){ |
| 739 | 739 | Stmt q; |
| 740 | 740 | db_prepare(&q, |
| 741 | - "SELECT datetime(mtime), coalesce(euser,user)," | |
| 742 | - " coalesce(ecomment,comment), uuid" | |
| 741 | + "SELECT datetime(event.mtime), coalesce(euser,user)," | |
| 742 | + " coalesce(ecomment,comment), uuid," | |
| 743 | + " coalesce((SELECT value FROM tagxref" | |
| 744 | + " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')" | |
| 743 | 745 | " FROM event, blob" |
| 744 | 746 | " WHERE event.objid=%d AND type='ci'" |
| 745 | 747 | " AND blob.rid=%d", |
| 746 | - rid, rid | |
| 748 | + TAG_BRANCH, rid, rid | |
| 747 | 749 | ); |
| 748 | 750 | while( db_step(&q)==SQLITE_ROW ){ |
| 749 | 751 | const char *zDate = db_column_text(&q, 0); |
| 750 | 752 | const char *zUser = db_column_text(&q, 1); |
| 751 | 753 | const char *zCom = db_column_text(&q, 2); |
| 752 | 754 | const char *zUuid = db_column_text(&q, 3); |
| 755 | + const char *zBranch = db_column_text(&q, 4); | |
| 753 | 756 | @ Check-in |
| 754 | 757 | hyperlink_to_uuid(zUuid); |
| 755 | - @ - %w(zCom) by | |
| 756 | - hyperlink_to_user(zUser,zDate," on"); | |
| 758 | + @ on branch <a href="%s(g.zTop)/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> | |
| 759 | + @ %s(zBranch)</a> - %w(zCom) by | |
| 760 | + hyperlink_to_user(zUser, zDate," on"); | |
| 757 | 761 | hyperlink_to_date(zDate, "."); |
| 758 | 762 | } |
| 759 | 763 | db_finalize(&q); |
| 760 | 764 | } |
| 761 | 765 | |
| 762 | 766 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -736,26 +736,30 @@ | |
| 736 | ** Output a description of a check-in |
| 737 | */ |
| 738 | void checkin_description(int rid){ |
| 739 | Stmt q; |
| 740 | db_prepare(&q, |
| 741 | "SELECT datetime(mtime), coalesce(euser,user)," |
| 742 | " coalesce(ecomment,comment), uuid" |
| 743 | " FROM event, blob" |
| 744 | " WHERE event.objid=%d AND type='ci'" |
| 745 | " AND blob.rid=%d", |
| 746 | rid, rid |
| 747 | ); |
| 748 | while( db_step(&q)==SQLITE_ROW ){ |
| 749 | const char *zDate = db_column_text(&q, 0); |
| 750 | const char *zUser = db_column_text(&q, 1); |
| 751 | const char *zCom = db_column_text(&q, 2); |
| 752 | const char *zUuid = db_column_text(&q, 3); |
| 753 | @ Check-in |
| 754 | hyperlink_to_uuid(zUuid); |
| 755 | @ - %w(zCom) by |
| 756 | hyperlink_to_user(zUser,zDate," on"); |
| 757 | hyperlink_to_date(zDate, "."); |
| 758 | } |
| 759 | db_finalize(&q); |
| 760 | } |
| 761 | |
| 762 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -736,26 +736,30 @@ | |
| 736 | ** Output a description of a check-in |
| 737 | */ |
| 738 | void checkin_description(int rid){ |
| 739 | Stmt q; |
| 740 | db_prepare(&q, |
| 741 | "SELECT datetime(event.mtime), coalesce(euser,user)," |
| 742 | " coalesce(ecomment,comment), uuid," |
| 743 | " coalesce((SELECT value FROM tagxref" |
| 744 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')" |
| 745 | " FROM event, blob" |
| 746 | " WHERE event.objid=%d AND type='ci'" |
| 747 | " AND blob.rid=%d", |
| 748 | TAG_BRANCH, rid, rid |
| 749 | ); |
| 750 | while( db_step(&q)==SQLITE_ROW ){ |
| 751 | const char *zDate = db_column_text(&q, 0); |
| 752 | const char *zUser = db_column_text(&q, 1); |
| 753 | const char *zCom = db_column_text(&q, 2); |
| 754 | const char *zUuid = db_column_text(&q, 3); |
| 755 | const char *zBranch = db_column_text(&q, 4); |
| 756 | @ Check-in |
| 757 | hyperlink_to_uuid(zUuid); |
| 758 | @ on branch <a href="%s(g.zTop)/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> |
| 759 | @ %s(zBranch)</a> - %w(zCom) by |
| 760 | hyperlink_to_user(zUser, zDate," on"); |
| 761 | hyperlink_to_date(zDate, "."); |
| 762 | } |
| 763 | db_finalize(&q); |
| 764 | } |
| 765 | |
| 766 |