Fossil

Check-in [ff9de303]
Login

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

Overview
Comment:Renamed 1/2-pane diffs to unified and side-by-side in the ui.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | jan-sbsdiff
Files: files | file ages | folders
SHA1:ff9de303e3bfb7d3788c3589a0ed03b17ac850ca
User & Date: jan 2011-10-16 21:04:05
Context
2011-10-16
23:24
Merge the latest trunk changes into the side-by-side diff branch. check-in: 23c3affa user: drh tags: jan-sbsdiff
21:04
Renamed 1/2-pane diffs to unified and side-by-side in the ui. check-in: ff9de303 user: jan tags: jan-sbsdiff
16:19
Add sbsdiff options when using show-version-diffs. check-in: adace758 user: jan tags: jan-sbsdiff
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/info.c.

549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
...
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
....
1096
1097
1098
1099
1100
1101
1102

1103
1104
1105

1106
1107
1108
1109
1110
1111
1112
1113
    if( db_get_boolean("show-version-diffs", 0)==0 ){
      showDiff = !showDiff;
      if( showDiff ){
        @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        if( sideBySide ){
          @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0">
          @ [show&nbsp;1-pane&nbsp;diffs]</a>
        }else{
          @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1">
          @ [show&nbsp;2-pane&nbsp;diffs]</a>
        }
      }else{
        @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0">
        @ [show&nbsp;1-pane&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1">
        @ [show&nbsp;2-pane&nbsp;diffs]</a>
      }
    }else{
      if( showDiff ){
        @ <a href="%s(g.zTop)/ci/%T(zName)">[hide&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        if( sideBySide ){
          @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0">
          @ [show&nbsp;1-pane&nbsp;diffs]</a>
        }else{
          @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1">
          @ [show&nbsp;2-pane&nbsp;diffs]</a>
        }
      }else{
        @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0">
        @ [show&nbsp;1-pane&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1">
        @ [show&nbsp;2-pane&nbsp;diffs]</a>
      }
    }
    @ &nbsp;&nbsp;
    @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/>
    db_prepare(&q,
       "SELECT name,"
       "       mperm,"
................................................................................
  pFrom = vdiff_parse_manifest("from", &ridFrom);
  if( pFrom==0 ) return;
  pTo = vdiff_parse_manifest("to", &ridTo);
  if( pTo==0 ) return;
  showDetail = atoi(PD("detail","0"));
  sideBySide = atoi(PD("sbs","1"));
  if( !sideBySide ){
    style_submenu_element("2-Pane Diff", "TPD",
                          "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1",
                          g.zTop, P("from"), P("to"), showDetail);
  }else{
    style_submenu_element("1-Pane Diff", "OPD",
                          "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0",
                          g.zTop, P("from"), P("to"), showDetail);
  }
  style_header("Check-in Differences");
  @ <h2>Difference From:</h2><blockquote>
  checkin_description(ridFrom);
  @ </blockquote><h2>To:</h2><blockquote>
................................................................................
    blob_reset(&c2);
  }
  if( !isPatch ){
    style_header("Diff");
    style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
                          g.zTop, P("v1"), P("v2"));
    if( !sideBySide ){

      style_submenu_element("2-Pane Diff", "TPD", "%s/fdiff?v1=%T&v2=%T&sbs=1",
                            g.zTop, P("v1"), P("v2"));
    }else{

      style_submenu_element("1-Pane Diff", "OPD", "%s/fdiff?v1=%T&v2=%T&sbs=0",
                            g.zTop, P("v1"), P("v2"));
    }

    @ <h2>Differences From
    @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2>
    object_description(v1, 0, 0);
    @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2>







|


|



|


|







|


|



|


|







 







|



|







 







>
|


>
|







549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
...
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
....
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
    if( db_get_boolean("show-version-diffs", 0)==0 ){
      showDiff = !showDiff;
      if( showDiff ){
        @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        if( sideBySide ){
          @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0">
          @ [unified&nbsp;diffs]</a>
        }else{
          @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1">
          @ [side-by-side&nbsp;diffs]</a>
        }
      }else{
        @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0">
        @ [show&nbsp;unified&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1">
        @ [show&nbsp;side-by-side&nbsp;diffs]</a>
      }
    }else{
      if( showDiff ){
        @ <a href="%s(g.zTop)/ci/%T(zName)">[hide&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        if( sideBySide ){
          @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0">
          @ [unified&nbsp;diffs]</a>
        }else{
          @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1">
          @ [side-by-side&nbsp;diffs]</a>
        }
      }else{
        @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0">
        @ [show&nbsp;unified&nbsp;diffs]</a>
        @ &nbsp;&nbsp;
        @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1">
        @ [show&nbsp;side-by-side&nbsp;diffs]</a>
      }
    }
    @ &nbsp;&nbsp;
    @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/>
    db_prepare(&q,
       "SELECT name,"
       "       mperm,"
................................................................................
  pFrom = vdiff_parse_manifest("from", &ridFrom);
  if( pFrom==0 ) return;
  pTo = vdiff_parse_manifest("to", &ridTo);
  if( pTo==0 ) return;
  showDetail = atoi(PD("detail","0"));
  sideBySide = atoi(PD("sbs","1"));
  if( !sideBySide ){
    style_submenu_element("Side-by-side Diff", "sbsdiff",
                          "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1",
                          g.zTop, P("from"), P("to"), showDetail);
  }else{
    style_submenu_element("Unified Diff", "udiff",
                          "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0",
                          g.zTop, P("from"), P("to"), showDetail);
  }
  style_header("Check-in Differences");
  @ <h2>Difference From:</h2><blockquote>
  checkin_description(ridFrom);
  @ </blockquote><h2>To:</h2><blockquote>
................................................................................
    blob_reset(&c2);
  }
  if( !isPatch ){
    style_header("Diff");
    style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
                          g.zTop, P("v1"), P("v2"));
    if( !sideBySide ){
      style_submenu_element("Side-by-side Diff", "sbsdiff",
                            "%s/fdiff?v1=%T&v2=%T&sbs=1",
                            g.zTop, P("v1"), P("v2"));
    }else{
      style_submenu_element("Unified Diff", "udiff",
                            "%s/fdiff?v1=%T&v2=%T&sbs=0",
                            g.zTop, P("v1"), P("v2"));
    }

    @ <h2>Differences From
    @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2>
    object_description(v1, 0, 0);
    @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2>