Fossil SCM
Avoid drawing multiple copies of cherrypick merge risers.
Commit
146f02f922dd929a572c6ea43e2f6d38b8a0b3b03cd6ae0b02ae31cf0e6c5925
Parent
e4e5b771d239d18…
1 file changed
+3
-2
+3
-2
| --- src/graph.js | ||
| +++ src/graph.js | ||
| @@ -433,11 +433,12 @@ | ||
| 433 | 433 | } |
| 434 | 434 | x1 += mergeLines[p.mo] |
| 435 | 435 | var y0 = p.y+2; |
| 436 | 436 | var isCP = p.hasOwnProperty('cu'); |
| 437 | 437 | if( p.mu==p.id ){ |
| 438 | - /* Merge out error to an existing riser from below */ | |
| 438 | + /* Special case: The merge riser already exists. Only draw the | |
| 439 | + /* horizontal line or arrow going from the node out to the riser. */ | |
| 439 | 440 | var dx = x1<x0 ? mArrow.w : -mArrow.w; |
| 440 | 441 | if( isCP ){ |
| 441 | 442 | drawCherrypickLine(x0,y0,x1+dx,null); |
| 442 | 443 | cls = "arrow cherrypick " + (x1<x0 ? "l" : "r"); |
| 443 | 444 | }else{ |
| @@ -451,11 +452,11 @@ | ||
| 451 | 452 | y1 = y0; |
| 452 | 453 | }else{ |
| 453 | 454 | drawMergeLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null); |
| 454 | 455 | drawMergeLine(x1,y0+mLine.w,null,y1); |
| 455 | 456 | } |
| 456 | - if( isCP ){ | |
| 457 | + if( isCP && p.cu!=p.id ){ | |
| 457 | 458 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 458 | 459 | var y2 = miLineY(u2); |
| 459 | 460 | drawCherrypickLine(x1,y1,null,y2); |
| 460 | 461 | } |
| 461 | 462 | }else if( mergeOffset ){ |
| 462 | 463 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -433,11 +433,12 @@ | |
| 433 | } |
| 434 | x1 += mergeLines[p.mo] |
| 435 | var y0 = p.y+2; |
| 436 | var isCP = p.hasOwnProperty('cu'); |
| 437 | if( p.mu==p.id ){ |
| 438 | /* Merge out error to an existing riser from below */ |
| 439 | var dx = x1<x0 ? mArrow.w : -mArrow.w; |
| 440 | if( isCP ){ |
| 441 | drawCherrypickLine(x0,y0,x1+dx,null); |
| 442 | cls = "arrow cherrypick " + (x1<x0 ? "l" : "r"); |
| 443 | }else{ |
| @@ -451,11 +452,11 @@ | |
| 451 | y1 = y0; |
| 452 | }else{ |
| 453 | drawMergeLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null); |
| 454 | drawMergeLine(x1,y0+mLine.w,null,y1); |
| 455 | } |
| 456 | if( isCP ){ |
| 457 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 458 | var y2 = miLineY(u2); |
| 459 | drawCherrypickLine(x1,y1,null,y2); |
| 460 | } |
| 461 | }else if( mergeOffset ){ |
| 462 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -433,11 +433,12 @@ | |
| 433 | } |
| 434 | x1 += mergeLines[p.mo] |
| 435 | var y0 = p.y+2; |
| 436 | var isCP = p.hasOwnProperty('cu'); |
| 437 | if( p.mu==p.id ){ |
| 438 | /* Special case: The merge riser already exists. Only draw the |
| 439 | /* horizontal line or arrow going from the node out to the riser. */ |
| 440 | var dx = x1<x0 ? mArrow.w : -mArrow.w; |
| 441 | if( isCP ){ |
| 442 | drawCherrypickLine(x0,y0,x1+dx,null); |
| 443 | cls = "arrow cherrypick " + (x1<x0 ? "l" : "r"); |
| 444 | }else{ |
| @@ -451,11 +452,11 @@ | |
| 452 | y1 = y0; |
| 453 | }else{ |
| 454 | drawMergeLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null); |
| 455 | drawMergeLine(x1,y0+mLine.w,null,y1); |
| 456 | } |
| 457 | if( isCP && p.cu!=p.id ){ |
| 458 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 459 | var y2 = miLineY(u2); |
| 460 | drawCherrypickLine(x1,y1,null,y2); |
| 461 | } |
| 462 | }else if( mergeOffset ){ |
| 463 |