Fossil SCM
Fix bug [c858c4178b] - at three places, the original checkin comment was taken from the repository. Only if there was no original checkin comment, the edited comment (<tt>ecomment</tt>) was fetched. That logic seem wrong. As at all other cases, first the <tt>ecommend</tt> was fetched and only when that failed, the original comment was taken, I corrected the three places in code accordingly.
Commit
589687d783c2e74de42b9969731d7342008ab348
Parent
16e308106f96879…
1 file changed
+3
-3
+3
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -116,11 +116,11 @@ | ||
| 116 | 116 | Stmt q; |
| 117 | 117 | int cnt = 0; |
| 118 | 118 | db_prepare(&q, |
| 119 | 119 | "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime')," |
| 120 | 120 | " coalesce(event.euser,event.user)," |
| 121 | - " coalesce(event.comment,event.ecomment)" | |
| 121 | + " coalesce(event.ecomment,event.comment)" | |
| 122 | 122 | " FROM plink, blob, event" |
| 123 | 123 | " WHERE plink.pid=%d" |
| 124 | 124 | " AND blob.rid=plink.cid" |
| 125 | 125 | " AND event.objid=plink.cid" |
| 126 | 126 | " ORDER BY plink.mtime ASC", |
| @@ -168,11 +168,11 @@ | ||
| 168 | 168 | Stmt q; |
| 169 | 169 | int cnt = 0; |
| 170 | 170 | db_prepare(&q, |
| 171 | 171 | "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime')," |
| 172 | 172 | " coalesce(event.euser,event.user)," |
| 173 | - " coalesce(event.comment,event.ecomment)" | |
| 173 | + " coalesce(event.ecomment,event.comment)" | |
| 174 | 174 | " FROM plink, blob, event" |
| 175 | 175 | " WHERE plink.cid=%d" |
| 176 | 176 | " AND blob.rid=plink.pid" |
| 177 | 177 | " AND event.objid=plink.pid" |
| 178 | 178 | " ORDER BY event.mtime DESC", |
| @@ -659,11 +659,11 @@ | ||
| 659 | 659 | Stmt q; |
| 660 | 660 | int cnt = 0; |
| 661 | 661 | int nWiki = 0; |
| 662 | 662 | db_prepare(&q, |
| 663 | 663 | "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10)," |
| 664 | - " coalesce(event.comment,event.ecomment)," | |
| 664 | + " coalesce(event.ecomment,event.comment)," | |
| 665 | 665 | " coalesce(event.euser,event.user)," |
| 666 | 666 | " b.uuid" |
| 667 | 667 | " FROM mlink, filename, event, blob a, blob b" |
| 668 | 668 | " WHERE filename.fnid=mlink.fnid" |
| 669 | 669 | " AND event.objid=mlink.mid" |
| 670 | 670 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -116,11 +116,11 @@ | |
| 116 | Stmt q; |
| 117 | int cnt = 0; |
| 118 | db_prepare(&q, |
| 119 | "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime')," |
| 120 | " coalesce(event.euser,event.user)," |
| 121 | " coalesce(event.comment,event.ecomment)" |
| 122 | " FROM plink, blob, event" |
| 123 | " WHERE plink.pid=%d" |
| 124 | " AND blob.rid=plink.cid" |
| 125 | " AND event.objid=plink.cid" |
| 126 | " ORDER BY plink.mtime ASC", |
| @@ -168,11 +168,11 @@ | |
| 168 | Stmt q; |
| 169 | int cnt = 0; |
| 170 | db_prepare(&q, |
| 171 | "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime')," |
| 172 | " coalesce(event.euser,event.user)," |
| 173 | " coalesce(event.comment,event.ecomment)" |
| 174 | " FROM plink, blob, event" |
| 175 | " WHERE plink.cid=%d" |
| 176 | " AND blob.rid=plink.pid" |
| 177 | " AND event.objid=plink.pid" |
| 178 | " ORDER BY event.mtime DESC", |
| @@ -659,11 +659,11 @@ | |
| 659 | Stmt q; |
| 660 | int cnt = 0; |
| 661 | int nWiki = 0; |
| 662 | db_prepare(&q, |
| 663 | "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10)," |
| 664 | " coalesce(event.comment,event.ecomment)," |
| 665 | " coalesce(event.euser,event.user)," |
| 666 | " b.uuid" |
| 667 | " FROM mlink, filename, event, blob a, blob b" |
| 668 | " WHERE filename.fnid=mlink.fnid" |
| 669 | " AND event.objid=mlink.mid" |
| 670 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -116,11 +116,11 @@ | |
| 116 | Stmt q; |
| 117 | int cnt = 0; |
| 118 | db_prepare(&q, |
| 119 | "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime')," |
| 120 | " coalesce(event.euser,event.user)," |
| 121 | " coalesce(event.ecomment,event.comment)" |
| 122 | " FROM plink, blob, event" |
| 123 | " WHERE plink.pid=%d" |
| 124 | " AND blob.rid=plink.cid" |
| 125 | " AND event.objid=plink.cid" |
| 126 | " ORDER BY plink.mtime ASC", |
| @@ -168,11 +168,11 @@ | |
| 168 | Stmt q; |
| 169 | int cnt = 0; |
| 170 | db_prepare(&q, |
| 171 | "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime')," |
| 172 | " coalesce(event.euser,event.user)," |
| 173 | " coalesce(event.ecomment,event.comment)" |
| 174 | " FROM plink, blob, event" |
| 175 | " WHERE plink.cid=%d" |
| 176 | " AND blob.rid=plink.pid" |
| 177 | " AND event.objid=plink.pid" |
| 178 | " ORDER BY event.mtime DESC", |
| @@ -659,11 +659,11 @@ | |
| 659 | Stmt q; |
| 660 | int cnt = 0; |
| 661 | int nWiki = 0; |
| 662 | db_prepare(&q, |
| 663 | "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10)," |
| 664 | " coalesce(event.ecomment,event.comment)," |
| 665 | " coalesce(event.euser,event.user)," |
| 666 | " b.uuid" |
| 667 | " FROM mlink, filename, event, blob a, blob b" |
| 668 | " WHERE filename.fnid=mlink.fnid" |
| 669 | " AND event.objid=mlink.mid" |
| 670 |