Fossil SCM
Timeline calculated localtime incorrectly so it didn't display latest changes if user is in TZ UTC+X
Commit
aad573b31cde9dfe8cfadd26c27e3ac07bcce6f3
Parent
df3d6cbff5949a1…
1 file changed
+2
-2
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -443,11 +443,11 @@ | ||
| 443 | 443 | const char *timeline_query_for_tty(void){ |
| 444 | 444 | static const char zBaseSql[] = |
| 445 | 445 | @ SELECT |
| 446 | 446 | @ blob.rid, |
| 447 | 447 | @ uuid, |
| 448 | - @ datetime(event.mtime,'localtime'), | |
| 448 | + @ datetime(event.mtime,'utc'), | |
| 449 | 449 | @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')', |
| 450 | 450 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim), |
| 451 | 451 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid) |
| 452 | 452 | @ FROM event, blob |
| 453 | 453 | @ WHERE blob.rid=event.objid |
| @@ -522,11 +522,11 @@ | ||
| 522 | 522 | blob_append(&uuid, zOrigin, -1); |
| 523 | 523 | if( strcmp(zOrigin, "now")==0 ){ |
| 524 | 524 | if( mode==3 || mode==4 ){ |
| 525 | 525 | fossil_fatal("cannot compute descendents or ancestors of a date"); |
| 526 | 526 | } |
| 527 | - zDate = mprintf("(SELECT julianday('now','utc'))"); | |
| 527 | + zDate = mprintf("(SELECT datetime('now'))"); | |
| 528 | 528 | }else if( strncmp(zOrigin, "current", k)==0 ){ |
| 529 | 529 | objid = db_lget_int("checkout",0); |
| 530 | 530 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 531 | 531 | }else if( name_to_uuid(&uuid, 0)==0 ){ |
| 532 | 532 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 533 | 533 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -443,11 +443,11 @@ | |
| 443 | const char *timeline_query_for_tty(void){ |
| 444 | static const char zBaseSql[] = |
| 445 | @ SELECT |
| 446 | @ blob.rid, |
| 447 | @ uuid, |
| 448 | @ datetime(event.mtime,'localtime'), |
| 449 | @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')', |
| 450 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim), |
| 451 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid) |
| 452 | @ FROM event, blob |
| 453 | @ WHERE blob.rid=event.objid |
| @@ -522,11 +522,11 @@ | |
| 522 | blob_append(&uuid, zOrigin, -1); |
| 523 | if( strcmp(zOrigin, "now")==0 ){ |
| 524 | if( mode==3 || mode==4 ){ |
| 525 | fossil_fatal("cannot compute descendents or ancestors of a date"); |
| 526 | } |
| 527 | zDate = mprintf("(SELECT julianday('now','utc'))"); |
| 528 | }else if( strncmp(zOrigin, "current", k)==0 ){ |
| 529 | objid = db_lget_int("checkout",0); |
| 530 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 531 | }else if( name_to_uuid(&uuid, 0)==0 ){ |
| 532 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 533 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -443,11 +443,11 @@ | |
| 443 | const char *timeline_query_for_tty(void){ |
| 444 | static const char zBaseSql[] = |
| 445 | @ SELECT |
| 446 | @ blob.rid, |
| 447 | @ uuid, |
| 448 | @ datetime(event.mtime,'utc'), |
| 449 | @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')', |
| 450 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim), |
| 451 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid) |
| 452 | @ FROM event, blob |
| 453 | @ WHERE blob.rid=event.objid |
| @@ -522,11 +522,11 @@ | |
| 522 | blob_append(&uuid, zOrigin, -1); |
| 523 | if( strcmp(zOrigin, "now")==0 ){ |
| 524 | if( mode==3 || mode==4 ){ |
| 525 | fossil_fatal("cannot compute descendents or ancestors of a date"); |
| 526 | } |
| 527 | zDate = mprintf("(SELECT datetime('now'))"); |
| 528 | }else if( strncmp(zOrigin, "current", k)==0 ){ |
| 529 | objid = db_lget_int("checkout",0); |
| 530 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 531 | }else if( name_to_uuid(&uuid, 0)==0 ){ |
| 532 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 533 |