Fossil

Check-in [589687d783]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 589687d783c2e74de42b9969731d7342008ab348
User & Date: cle 2008-08-14 16:15:17.000
Context
2008-08-15
10:19
Beautify the permission explanation table on the /setup page. ... (check-in: 091fa4d4b2 user: hintze tags: trunk)
2008-08-14
16:15
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. ... (check-in: 589687d783 user: cle tags: trunk)
05:27
Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages) ... (check-in: 16e308106f user: bharder tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/info.c.
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
*/
static int showDescendants(int pid, int depth, const char *zTitle){
  Stmt q;
  int cnt = 0;
  db_prepare(&q,
    "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime'),"
    "       coalesce(event.euser,event.user),"
    "       coalesce(event.comment,event.ecomment)"
    "  FROM plink, blob, event"
    " WHERE plink.pid=%d"
    "   AND blob.rid=plink.cid"
    "   AND event.objid=plink.cid"
    " ORDER BY plink.mtime ASC",
    pid
  );







|







114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
*/
static int showDescendants(int pid, int depth, const char *zTitle){
  Stmt q;
  int cnt = 0;
  db_prepare(&q,
    "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime'),"
    "       coalesce(event.euser,event.user),"
    "       coalesce(event.ecomment,event.comment)"
    "  FROM plink, blob, event"
    " WHERE plink.pid=%d"
    "   AND blob.rid=plink.cid"
    "   AND event.objid=plink.cid"
    " ORDER BY plink.mtime ASC",
    pid
  );
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
*/
static void showAncestors(int pid, int depth, const char *zTitle){
  Stmt q;
  int cnt = 0;
  db_prepare(&q,
    "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime'),"
    "       coalesce(event.euser,event.user),"
    "       coalesce(event.comment,event.ecomment)"
    "  FROM plink, blob, event"
    " WHERE plink.cid=%d"
    "   AND blob.rid=plink.pid"
    "   AND event.objid=plink.pid"
    " ORDER BY event.mtime DESC",
    pid
  );







|







166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
*/
static void showAncestors(int pid, int depth, const char *zTitle){
  Stmt q;
  int cnt = 0;
  db_prepare(&q,
    "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime'),"
    "       coalesce(event.euser,event.user),"
    "       coalesce(event.ecomment,event.comment)"
    "  FROM plink, blob, event"
    " WHERE plink.cid=%d"
    "   AND blob.rid=plink.pid"
    "   AND event.objid=plink.pid"
    " ORDER BY event.mtime DESC",
    pid
  );
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
*/
static void object_description(int rid, int linkToView){
  Stmt q;
  int cnt = 0;
  int nWiki = 0;
  db_prepare(&q,
    "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10),"
    "       coalesce(event.comment,event.ecomment),"
    "       coalesce(event.euser,event.user),"
    "       b.uuid"
    "  FROM mlink, filename, event, blob a, blob b"
    " WHERE filename.fnid=mlink.fnid"
    "   AND event.objid=mlink.mid"
    "   AND a.rid=mlink.fid"
    "   AND b.rid=mlink.mid"







|







657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
*/
static void object_description(int rid, int linkToView){
  Stmt q;
  int cnt = 0;
  int nWiki = 0;
  db_prepare(&q,
    "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10),"
    "       coalesce(event.ecomment,event.comment),"
    "       coalesce(event.euser,event.user),"
    "       b.uuid"
    "  FROM mlink, filename, event, blob a, blob b"
    " WHERE filename.fnid=mlink.fnid"
    "   AND event.objid=mlink.mid"
    "   AND a.rid=mlink.fid"
    "   AND b.rid=mlink.mid"