Fossil

Check-in [d0988fb5]
Login

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

Overview
Comment:Add button to toggle sbsdiff for /fdiff views.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | jan-sbsdiff
Files: files | file ages | folders
SHA1:d0988fb5bb0cfbee48f5ac4e95b68049b3a240c8
User & Date: jan 2011-10-15 18:05:35
Context
2011-10-15
18:45
Add button to toggle sbsdiff for /vdiff views. Renamed the button in /fdiff. check-in: d1f63cd8 user: jan tags: jan-sbsdiff
18:05
Add button to toggle sbsdiff for /fdiff views. check-in: d0988fb5 user: jan tags: jan-sbsdiff
15:42
Merge the latest trunk changes into the side-by-side diff branch. check-in: 15de70c2 user: drh tags: jan-sbsdiff
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/info.c.

1061
1062
1063
1064
1065
1066
1067










1068
1069
1070
1071
1072
1073
1074
    blob_reset(&c1);
    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"));










    @ <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>
    object_description(v2, 0, 0);
    @ <hr />
    if( sideBySide ){







>
>
>
>
>
>
>
>
>
>







1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
    blob_reset(&c1);
    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>
    object_description(v2, 0, 0);
    @ <hr />
    if( sideBySide ){