Fossil SCM
Fix a bug in timeline introduced by the previous check-in. Improvements to the file timeline.
Commit
6953184210e92dc4f515bd405a35a93b10eacb1b
Parent
c19467d68ecfc90…
2 files changed
+5
-4
+1
-1
+5
-4
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -166,11 +166,12 @@ | ||
| 166 | 166 | @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> |
| 167 | 167 | @ </td></tr> |
| 168 | 168 | } |
| 169 | 169 | memcpy(zTime, &zDate[11], 5); |
| 170 | 170 | zTime[5] = 0; |
| 171 | - @ <tr><td valign="top" align="right">%s(zTime)</td> | |
| 171 | + @ <tr><td valign="top" align="right"> | |
| 172 | + @ <a href="%s(g.zTop)/timeline?c=%t(zDate)">%s(zTime)</a></td> | |
| 172 | 173 | @ <td width="20" align="left" valign="top"><div id="m%d(gidx)"></div></td> |
| 173 | 174 | if( zBgClr && zBgClr[0] ){ |
| 174 | 175 | @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> |
| 175 | 176 | }else{ |
| 176 | 177 | @ <td valign="top" align="left"> |
| @@ -182,13 +183,13 @@ | ||
| 182 | 183 | }else{ |
| 183 | 184 | @ [%s(zShort)] |
| 184 | 185 | } |
| 185 | 186 | @ part of check-in |
| 186 | 187 | hyperlink_to_uuid(zShortCkin); |
| 187 | - @ %h(zCom) (By: | |
| 188 | - hyperlink_to_user(zUser, zDate, " on"); | |
| 189 | - hyperlink_to_date(zDate, ")"); | |
| 188 | + @ %h(zCom) (user: | |
| 189 | + hyperlink_to_user(zUser, zDate, ""); | |
| 190 | + @ branch: %h(zBr)) | |
| 190 | 191 | if( g.okHistory ){ |
| 191 | 192 | if( fpid ){ |
| 192 | 193 | @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&v2=%d(frid)">[diff]</a> |
| 193 | 194 | } |
| 194 | 195 | @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&fnid=%d(fnid)"> |
| 195 | 196 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -166,11 +166,12 @@ | |
| 166 | @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> |
| 167 | @ </td></tr> |
| 168 | } |
| 169 | memcpy(zTime, &zDate[11], 5); |
| 170 | zTime[5] = 0; |
| 171 | @ <tr><td valign="top" align="right">%s(zTime)</td> |
| 172 | @ <td width="20" align="left" valign="top"><div id="m%d(gidx)"></div></td> |
| 173 | if( zBgClr && zBgClr[0] ){ |
| 174 | @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> |
| 175 | }else{ |
| 176 | @ <td valign="top" align="left"> |
| @@ -182,13 +183,13 @@ | |
| 182 | }else{ |
| 183 | @ [%s(zShort)] |
| 184 | } |
| 185 | @ part of check-in |
| 186 | hyperlink_to_uuid(zShortCkin); |
| 187 | @ %h(zCom) (By: |
| 188 | hyperlink_to_user(zUser, zDate, " on"); |
| 189 | hyperlink_to_date(zDate, ")"); |
| 190 | if( g.okHistory ){ |
| 191 | if( fpid ){ |
| 192 | @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&v2=%d(frid)">[diff]</a> |
| 193 | } |
| 194 | @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&fnid=%d(fnid)"> |
| 195 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -166,11 +166,12 @@ | |
| 166 | @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> |
| 167 | @ </td></tr> |
| 168 | } |
| 169 | memcpy(zTime, &zDate[11], 5); |
| 170 | zTime[5] = 0; |
| 171 | @ <tr><td valign="top" align="right"> |
| 172 | @ <a href="%s(g.zTop)/timeline?c=%t(zDate)">%s(zTime)</a></td> |
| 173 | @ <td width="20" align="left" valign="top"><div id="m%d(gidx)"></div></td> |
| 174 | if( zBgClr && zBgClr[0] ){ |
| 175 | @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> |
| 176 | }else{ |
| 177 | @ <td valign="top" align="left"> |
| @@ -182,13 +183,13 @@ | |
| 183 | }else{ |
| 184 | @ [%s(zShort)] |
| 185 | } |
| 186 | @ part of check-in |
| 187 | hyperlink_to_uuid(zShortCkin); |
| 188 | @ %h(zCom) (user: |
| 189 | hyperlink_to_user(zUser, zDate, ""); |
| 190 | @ branch: %h(zBr)) |
| 191 | if( g.okHistory ){ |
| 192 | if( fpid ){ |
| 193 | @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&v2=%d(frid)">[diff]</a> |
| 194 | } |
| 195 | @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&fnid=%d(fnid)"> |
| 196 |
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -253,11 +253,11 @@ | ||
| 253 | 253 | memcpy(zTime, &zDate[11], 5); |
| 254 | 254 | zTime[5] = 0; |
| 255 | 255 | @ <tr> |
| 256 | 256 | @ <td valign="top" align="right">%s(zTime)</td> |
| 257 | 257 | @ <td width="20" align="left" valign="top"> |
| 258 | - if( pGraph ){ | |
| 258 | + if( pGraph && zType[0]=='c' ){ | |
| 259 | 259 | int nParent = 0; |
| 260 | 260 | int aParent[32]; |
| 261 | 261 | const char *zBr; |
| 262 | 262 | int gidx; |
| 263 | 263 | static Stmt qparent; |
| 264 | 264 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -253,11 +253,11 @@ | |
| 253 | memcpy(zTime, &zDate[11], 5); |
| 254 | zTime[5] = 0; |
| 255 | @ <tr> |
| 256 | @ <td valign="top" align="right">%s(zTime)</td> |
| 257 | @ <td width="20" align="left" valign="top"> |
| 258 | if( pGraph ){ |
| 259 | int nParent = 0; |
| 260 | int aParent[32]; |
| 261 | const char *zBr; |
| 262 | int gidx; |
| 263 | static Stmt qparent; |
| 264 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -253,11 +253,11 @@ | |
| 253 | memcpy(zTime, &zDate[11], 5); |
| 254 | zTime[5] = 0; |
| 255 | @ <tr> |
| 256 | @ <td valign="top" align="right">%s(zTime)</td> |
| 257 | @ <td width="20" align="left" valign="top"> |
| 258 | if( pGraph && zType[0]=='c' ){ |
| 259 | int nParent = 0; |
| 260 | int aParent[32]; |
| 261 | const char *zBr; |
| 262 | int gidx; |
| 263 | static Stmt qparent; |
| 264 |