Fossil

Check-in [9d39c6dc]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Differentiate merge check-ins from regular, linear check-ins
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | differentiate-timeline
Files: files | file ages | folders
SHA1:9d39c6dca7be2796f9a2ede9ab1f5e1a98a09d3b
User & Date: jmoger 2015-03-18 16:45:48
Context
2015-03-19
17:53
Display all check-in nodes as circles, color branch rails, use Xekri to demonstrate trunk rail controls check-in: 529c07af user: jmoger tags: differentiate-timeline
2015-03-18
16:45
Differentiate merge check-ins from regular, linear check-ins check-in: 9d39c6dc user: jmoger tags: differentiate-timeline
2015-03-17
17:10
Improvements to the HTML generated for the /xfersetup page. check-in: f215075a user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

802
803
804
805
806
807
808
809

810

811
812

813
814
815
816
817
818
819
820
821
822
823
...
922
923
924
925
926
927
928

929
930
931
932
933
934
935
    @     n.style.borderRightColor = lineClr;
    @   }
    @   cDiv.appendChild(n);
    @ }
    @ function drawThinLine(x0,y0,x1,y1){
    @   drawBox(lineClr,x0,y0,x1,y1);
    @ }
    @ function drawNodeBox(color,x0,y0,x1,y1){

    @   drawBox(color,x0,y0,x1,y1).style.cursor = "pointer";

    @ }
    @ function drawNode(p, left, btm){

    @   drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6);
    @   drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5);
    @   if( p.u>0 ) drawUpArrow(p.x, rowinfo[p.u-1].y+6, p.y-5);
    @   if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2);
    if( !omitDescenders ){
      @   if( p.u==0 ) drawUpArrow(p.x, 0, p.y-5);
      @   if( p.d ) drawUpArrow(p.x, p.y+6, btm);
    }
    @   if( p.mo>0 ){
    @     var x1 = p.mo + left - 1;
    @     var y1 = p.y-3;
................................................................................
    @       break;
    @     }
    @   }
    @ }
    @ function clickOnRow(p){
    @   if( selRow==null ){
    @     selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3);

    @     selRow = p;
    @   }else if( selRow==p ){
    @     var canvasDiv = gebi("canvas");
    @     canvasDiv.removeChild(selBox);
    @     selBox = null;
    @     selRow = null;
    @   }else{







|
>
|
>


>
|
|

|







 







>







802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
...
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
    @     n.style.borderRightColor = lineClr;
    @   }
    @   cDiv.appendChild(n);
    @ }
    @ function drawThinLine(x0,y0,x1,y1){
    @   drawBox(lineClr,x0,y0,x1,y1);
    @ }
    @ function drawNodeBox(color,x0,y0,x1,y1,isMerge){
    @   var n = drawBox(color,x0,y0,x1,y1);
    @   n.style.cursor = "pointer";
    @   if ( !isMerge ) n.style.borderRadius = "6px";
    @ }
    @ function drawNode(p, left, btm){
    @   var isMerge = p.mi.length>0;
    @   drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6,isMerge);
    @   drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5,isMerge);
    @   if( p.u>0 ) drawUpArrow(p.x, rowinfo[p.u-1].y+6, p.y-5);
    @   if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2,isMerge);
    if( !omitDescenders ){
      @   if( p.u==0 ) drawUpArrow(p.x, 0, p.y-5);
      @   if( p.d ) drawUpArrow(p.x, p.y+6, btm);
    }
    @   if( p.mo>0 ){
    @     var x1 = p.mo + left - 1;
    @     var y1 = p.y-3;
................................................................................
    @       break;
    @     }
    @   }
    @ }
    @ function clickOnRow(p){
    @   if( selRow==null ){
    @     selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3);
    @     if ( p.mi.length==0 ) selBox.style.borderRadius="6px";
    @     selRow = p;
    @   }else if( selRow==p ){
    @     var canvasDiv = gebi("canvas");
    @     canvasDiv.removeChild(selBox);
    @     selBox = null;
    @     selRow = null;
    @   }else{