Fossil

Check-in [4e4d0fa527]
Login

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

Overview
Comment:If sbs=0 and v=0, then both buttons "Side-by-side Diff" and "Unified Diff" should be shown on the /vdiff page. Note that sbs=1 implies v=1, so it is not necessary to put both parameters on any /vdiff.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4e4d0fa5278d9080ddb6033de2a0f1ca9e4eaaf1
User & Date: jan.nijtmans 2013-05-01 13:31:43.033
Context
2013-05-01
16:02
Fix an off-by-one error in the binary search for file suffixes when trying to guess the mimetype of a file. Ticket [da461aefee1351] ... (check-in: 96b09d89a1 user: drh tags: trunk)
13:31
If sbs=0 and v=0, then both buttons "Side-by-side Diff" and "Unified Diff" should be shown on the /vdiff page. Note that sbs=1 implies v=1, so it is not necessary to put both parameters on any /vdiff. ... (check-in: 4e4d0fa527 user: jan.nijtmans tags: trunk)
09:42
Add -v|--verbose as alternative to "-l|--detail" everywhere. And "v=" and "verbose=" as alternative to the "detail=" URL parameter. ... (check-in: 5214a2a8b8 user: jan.nijtmans tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/info.c.
925
926
927
928
929
930
931
932
933

934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
  }
  verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
  if( !verboseFlag && sideBySide ) verboseFlag = 1;
  zFrom = P("from");
  zTo = P("to");
  if( !sideBySide ){
    style_submenu_element("Side-by-side Diff", "sbsdiff",
                          "%R/vdiff?from=%T&to=%T%s&sbs=1",
                          zFrom, zTo, verboseFlag?"&v=1":"");

  }else{
    style_submenu_element("Unified Diff", "udiff",
                          "%R/vdiff?from=%T&to=%T%s&sbs=0",
                          zFrom, zTo, verboseFlag?"&v=1":"");
  }
  style_submenu_element("Invert", "invert",
                        "%R/vdiff?from=%T&to=%T%s&sbs=%d",
                        zTo, zFrom, verboseFlag?"&v=1":"", sideBySide);
  style_header("Check-in Differences");
  @ <h2>Difference From:</h2><blockquote>
  checkin_description(ridFrom);
  @ </blockquote><h2>To:</h2><blockquote>
  checkin_description(ridTo);
  @ </blockquote>
  if( pRe ){







|
|
>
|

|
|


|
|







925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
  }
  verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
  if( !verboseFlag && sideBySide ) verboseFlag = 1;
  zFrom = P("from");
  zTo = P("to");
  if( !sideBySide ){
    style_submenu_element("Side-by-side Diff", "sbsdiff",
                          "%R/vdiff?from=%T&to=%T&sbs=1",
                          zFrom, zTo);
  }
  if( sideBySide || !verboseFlag ) {
    style_submenu_element("Unified Diff", "udiff",
                          "%R/vdiff?from=%T&to=%T%s&sbs=0&v=1",
                          zFrom, zTo);
  }
  style_submenu_element("Invert", "invert",
                        "%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
                        sideBySide, (verboseFlag && !sideBySide)?"&v=1":"");
  style_header("Check-in Differences");
  @ <h2>Difference From:</h2><blockquote>
  checkin_description(ridFrom);
  @ </blockquote><h2>To:</h2><blockquote>
  checkin_description(ridTo);
  @ </blockquote>
  if( pRe ){