Fossil SCM
Fixing the display of the artifact description when the artifact appears as different filenames.
Commit
f8eff242feec06c6f6f901e8babf624f795b945f
Parent
d34a1b9f3d93b07…
1 file changed
+4
-1
+4
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -789,11 +789,11 @@ | ||
| 789 | 789 | " WHERE filename.fnid=mlink.fnid" |
| 790 | 790 | " AND event.objid=mlink.mid" |
| 791 | 791 | " AND a.rid=mlink.fid" |
| 792 | 792 | " AND b.rid=mlink.mid" |
| 793 | 793 | " AND mlink.fid=%d" |
| 794 | - " ORDER BY event.mtime", | |
| 794 | + " ORDER BY filename.name, event.mtime", | |
| 795 | 795 | rid |
| 796 | 796 | ); |
| 797 | 797 | @ <ul> |
| 798 | 798 | while( db_step(&q)==SQLITE_ROW ){ |
| 799 | 799 | const char *zName = db_column_text(&q, 0); |
| @@ -804,10 +804,13 @@ | ||
| 804 | 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | 805 | if( !prevName ) { |
| 806 | 806 | @ <ul> |
| 807 | 807 | prevName = fossil_strdup(zName); |
| 808 | 808 | } |
| 809 | + else { | |
| 810 | + @ </ul> | |
| 811 | + } | |
| 809 | 812 | @ <li>File |
| 810 | 813 | if( g.okHistory ){ |
| 811 | 814 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 812 | 815 | }else{ |
| 813 | 816 | @ %h(zName) |
| 814 | 817 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -789,11 +789,11 @@ | |
| 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 event.mtime", |
| 795 | rid |
| 796 | ); |
| 797 | @ <ul> |
| 798 | while( db_step(&q)==SQLITE_ROW ){ |
| 799 | const char *zName = db_column_text(&q, 0); |
| @@ -804,10 +804,13 @@ | |
| 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | if( !prevName ) { |
| 806 | @ <ul> |
| 807 | prevName = fossil_strdup(zName); |
| 808 | } |
| 809 | @ <li>File |
| 810 | if( g.okHistory ){ |
| 811 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 812 | }else{ |
| 813 | @ %h(zName) |
| 814 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -789,11 +789,11 @@ | |
| 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); |
| @@ -804,10 +804,13 @@ | |
| 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | if( !prevName ) { |
| 806 | @ <ul> |
| 807 | prevName = fossil_strdup(zName); |
| 808 | } |
| 809 | else { |
| 810 | @ </ul> |
| 811 | } |
| 812 | @ <li>File |
| 813 | if( g.okHistory ){ |
| 814 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 815 | }else{ |
| 816 | @ %h(zName) |
| 817 |