Fossil SCM
Fix timeline command bug reported by Roy Keene. If the nearest artifact found is a wiki page, it may not have a child, so instead use time time of whatever name_to_uuid finds. For example: fossil timeline after 2015-03-14T13:46:20
Commit
a85eb7c6dcc616b961a1ccee2bcad37d7e0b1932
Parent
88e1bef9ec833dd…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2169,11 +2169,11 @@ | ||
| 2169 | 2169 | } |
| 2170 | 2170 | objid = db_lget_int("checkout",0); |
| 2171 | 2171 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 2172 | 2172 | }else if( name_to_uuid(&uuid, 0, "*")==0 ){ |
| 2173 | 2173 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 2174 | - zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); | |
| 2174 | + zDate = mprintf("(SELECT mtime FROM event WHERE objid=%d)", objid); | |
| 2175 | 2175 | }else{ |
| 2176 | 2176 | const char *zShift = ""; |
| 2177 | 2177 | if( mode==3 || mode==4 ){ |
| 2178 | 2178 | fossil_fatal("cannot compute descendants or ancestors of a date"); |
| 2179 | 2179 | } |
| 2180 | 2180 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2169,11 +2169,11 @@ | |
| 2169 | } |
| 2170 | objid = db_lget_int("checkout",0); |
| 2171 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 2172 | }else if( name_to_uuid(&uuid, 0, "*")==0 ){ |
| 2173 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 2174 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 2175 | }else{ |
| 2176 | const char *zShift = ""; |
| 2177 | if( mode==3 || mode==4 ){ |
| 2178 | fossil_fatal("cannot compute descendants or ancestors of a date"); |
| 2179 | } |
| 2180 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2169,11 +2169,11 @@ | |
| 2169 | } |
| 2170 | objid = db_lget_int("checkout",0); |
| 2171 | zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid); |
| 2172 | }else if( name_to_uuid(&uuid, 0, "*")==0 ){ |
| 2173 | objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 2174 | zDate = mprintf("(SELECT mtime FROM event WHERE objid=%d)", objid); |
| 2175 | }else{ |
| 2176 | const char *zShift = ""; |
| 2177 | if( mode==3 || mode==4 ){ |
| 2178 | fossil_fatal("cannot compute descendants or ancestors of a date"); |
| 2179 | } |
| 2180 |