Fossil SCM
manifest_crosslink() should always be called, wheter run_common_script() fails or not. revert experimental change in timeline
Commit
b6b656a0ec2fbf54ca4f4d9bb5748f15e3aeeb7b
Parent
26d6877ff637916…
2 files changed
+2
-1
+2
-6
+2
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1807,11 +1807,12 @@ | ||
| 1807 | 1807 | if( nvid==0 ){ |
| 1808 | 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | 1809 | } |
| 1810 | 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | 1811 | if( !dryRunFlag ){ |
| 1812 | - if( run_common_script() || manifest_crosslink(nvid, &manifest)==0 ){ | |
| 1812 | + run_common_script(); | |
| 1813 | + if( manifest_crosslink(nvid, &manifest)==0 ){ | |
| 1813 | 1814 | fossil_fatal("%s\n", g.zErrMsg); |
| 1814 | 1815 | } |
| 1815 | 1816 | } |
| 1816 | 1817 | assert( blob_is_reset(&manifest) ); |
| 1817 | 1818 | content_deltify(vid, nvid, 0); |
| 1818 | 1819 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1807,11 +1807,12 @@ | |
| 1807 | if( nvid==0 ){ |
| 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | } |
| 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | if( !dryRunFlag ){ |
| 1812 | if( run_common_script() || manifest_crosslink(nvid, &manifest)==0 ){ |
| 1813 | fossil_fatal("%s\n", g.zErrMsg); |
| 1814 | } |
| 1815 | } |
| 1816 | assert( blob_is_reset(&manifest) ); |
| 1817 | content_deltify(vid, nvid, 0); |
| 1818 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1807,11 +1807,12 @@ | |
| 1807 | if( nvid==0 ){ |
| 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | } |
| 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | if( !dryRunFlag ){ |
| 1812 | run_common_script(); |
| 1813 | if( manifest_crosslink(nvid, &manifest)==0 ){ |
| 1814 | fossil_fatal("%s\n", g.zErrMsg); |
| 1815 | } |
| 1816 | } |
| 1817 | assert( blob_is_reset(&manifest) ); |
| 1818 | content_deltify(vid, nvid, 0); |
| 1819 |
+2
-6
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -369,18 +369,14 @@ | ||
| 369 | 369 | zUuid, isLeaf); |
| 370 | 370 | db_reset(&qbranch); |
| 371 | 371 | @ <div id="m%d(gidx)"></div> |
| 372 | 372 | } |
| 373 | 373 | @</td> |
| 374 | - @ <td class="timelineTableCell" | |
| 375 | - if( zTagList && zTagList[0] ){ | |
| 376 | - @ class="%h(zTagList)" | |
| 377 | - } | |
| 378 | 374 | if( zBgClr && zBgClr[0] ){ |
| 379 | - @ style="background-color: %h(zBgClr);"> | |
| 375 | + @ <td class="timelineTableCell" style="background-color: %h(zBgClr);"> | |
| 380 | 376 | }else{ |
| 381 | - @ > | |
| 377 | + @ <td class="timelineTableCell"> | |
| 382 | 378 | } |
| 383 | 379 | if( pGraph && zType[0]!='c' ){ |
| 384 | 380 | @ • |
| 385 | 381 | } |
| 386 | 382 | if( modPending ){ |
| 387 | 383 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -369,18 +369,14 @@ | |
| 369 | zUuid, isLeaf); |
| 370 | db_reset(&qbranch); |
| 371 | @ <div id="m%d(gidx)"></div> |
| 372 | } |
| 373 | @</td> |
| 374 | @ <td class="timelineTableCell" |
| 375 | if( zTagList && zTagList[0] ){ |
| 376 | @ class="%h(zTagList)" |
| 377 | } |
| 378 | if( zBgClr && zBgClr[0] ){ |
| 379 | @ style="background-color: %h(zBgClr);"> |
| 380 | }else{ |
| 381 | @ > |
| 382 | } |
| 383 | if( pGraph && zType[0]!='c' ){ |
| 384 | @ • |
| 385 | } |
| 386 | if( modPending ){ |
| 387 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -369,18 +369,14 @@ | |
| 369 | zUuid, isLeaf); |
| 370 | db_reset(&qbranch); |
| 371 | @ <div id="m%d(gidx)"></div> |
| 372 | } |
| 373 | @</td> |
| 374 | if( zBgClr && zBgClr[0] ){ |
| 375 | @ <td class="timelineTableCell" style="background-color: %h(zBgClr);"> |
| 376 | }else{ |
| 377 | @ <td class="timelineTableCell"> |
| 378 | } |
| 379 | if( pGraph && zType[0]!='c' ){ |
| 380 | @ • |
| 381 | } |
| 382 | if( modPending ){ |
| 383 |