Fossil SCM
tiny cleanup
Commit
9340f2fc814dbd62cb8c6956eb8ed4474d4414ce
Parent
2fa1a8a935b1826…
1 file changed
+5
-7
+5
-7
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -368,18 +368,16 @@ | ||
| 368 | 368 | const char *zLastCkin = db_column_text(&q, 5); |
| 369 | 369 | const char *zBgClr = db_column_text(&q, 6); |
| 370 | 370 | char *zAge = human_readable_age(rNow - rMtime); |
| 371 | 371 | sqlite3_int64 iMtime = (sqlite3_int64)(rMtime*86400.0); |
| 372 | 372 | if( zMergeTo && zMergeTo[0]==0 ) zMergeTo = 0; |
| 373 | - if( zBgClr == 0 ){ | |
| 374 | - if( zBranch==0 || strcmp(zBranch,"trunk")==0 ){ | |
| 375 | - zBgClr = 0; | |
| 376 | - }else{ | |
| 377 | - zBgClr = hash_color(zBranch); | |
| 378 | - } | |
| 379 | - } | |
| 380 | 373 | if( show_colors ){ |
| 374 | + if( zBgClr == 0 ){ | |
| 375 | + if( zBranch!=0 && strcmp(zBranch,"trunk")!=0 ){ | |
| 376 | + zBgClr = hash_color(zBranch); | |
| 377 | + } | |
| 378 | + } | |
| 381 | 379 | @ <tr style="background-color:%s(zBgClr)"> |
| 382 | 380 | }else{ |
| 383 | 381 | @ <tr> |
| 384 | 382 | } |
| 385 | 383 | @ <td>%z(href("%R/timeline?n=100&r=%T",zBranch))%h(zBranch)</a></td> |
| 386 | 384 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -368,18 +368,16 @@ | |
| 368 | const char *zLastCkin = db_column_text(&q, 5); |
| 369 | const char *zBgClr = db_column_text(&q, 6); |
| 370 | char *zAge = human_readable_age(rNow - rMtime); |
| 371 | sqlite3_int64 iMtime = (sqlite3_int64)(rMtime*86400.0); |
| 372 | if( zMergeTo && zMergeTo[0]==0 ) zMergeTo = 0; |
| 373 | if( zBgClr == 0 ){ |
| 374 | if( zBranch==0 || strcmp(zBranch,"trunk")==0 ){ |
| 375 | zBgClr = 0; |
| 376 | }else{ |
| 377 | zBgClr = hash_color(zBranch); |
| 378 | } |
| 379 | } |
| 380 | if( show_colors ){ |
| 381 | @ <tr style="background-color:%s(zBgClr)"> |
| 382 | }else{ |
| 383 | @ <tr> |
| 384 | } |
| 385 | @ <td>%z(href("%R/timeline?n=100&r=%T",zBranch))%h(zBranch)</a></td> |
| 386 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -368,18 +368,16 @@ | |
| 368 | const char *zLastCkin = db_column_text(&q, 5); |
| 369 | const char *zBgClr = db_column_text(&q, 6); |
| 370 | char *zAge = human_readable_age(rNow - rMtime); |
| 371 | sqlite3_int64 iMtime = (sqlite3_int64)(rMtime*86400.0); |
| 372 | if( zMergeTo && zMergeTo[0]==0 ) zMergeTo = 0; |
| 373 | if( show_colors ){ |
| 374 | if( zBgClr == 0 ){ |
| 375 | if( zBranch!=0 && strcmp(zBranch,"trunk")!=0 ){ |
| 376 | zBgClr = hash_color(zBranch); |
| 377 | } |
| 378 | } |
| 379 | @ <tr style="background-color:%s(zBgClr)"> |
| 380 | }else{ |
| 381 | @ <tr> |
| 382 | } |
| 383 | @ <td>%z(href("%R/timeline?n=100&r=%T",zBranch))%h(zBranch)</a></td> |
| 384 |