Fossil

Check-in [74a4db25]
Login

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

Overview
Comment:Merge in hide-diff-on-vdiff_page...

Which now give possibility to hide or show full detailed diff on vdiff page. (when clicking on 2 nodes on timeline) Just like the /info page.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:74a4db258a5de6666023e27a7dd768ef3db4d278
User & Date: mgagnon 2013-11-22 01:14:18
Context
2013-11-22
09:25
unused variable check-in: 0deb022a user: jan.nijtmans tags: trunk
01:14
Merge in hide-diff-on-vdiff_page...

Which now give possibility to hide or show full detailed diff on vdiff page. (when clicking on 2 nodes on timeline) Just like the /info page. check-in: 74a4db25 user: mgagnon tags: trunk

01:09
merge in latest trunk Closed-Leaf check-in: 8af8232f user: mgagnon tags: hide-diff-on-vdiff_page
2013-11-21
23:39
Update to the lastest SQLite that includes the OP_Column rewrite and the constant expression factoring logic. check-in: 8dc9d009 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/info.c.

   963    963     if( !zVerbose ){
   964    964       zVerbose = P("detail"); /* deprecated */
   965    965     }
   966    966     verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
   967    967     if( !verboseFlag && sideBySide ) verboseFlag = 1;
   968    968     zFrom = P("from");
   969    969     zTo = P("to");
          970  +  if( sideBySide || verboseFlag ){
          971  +    style_submenu_element("Hide Diff", "hidediff",
          972  +                          "%R/vdiff?from=%T&to=%T&sbs=0",
          973  +                          zFrom, zTo);
          974  +  }
   970    975     if( !sideBySide ){
   971    976       style_submenu_element("Side-by-side Diff", "sbsdiff",
   972    977                             "%R/vdiff?from=%T&to=%T&sbs=1",
   973    978                             zFrom, zTo);
   974    979     }
   975    980     if( sideBySide || !verboseFlag ) {
   976    981       style_submenu_element("Unified Diff", "udiff",

Changes to src/setup.c.

  1209   1209     @ in a separate box (using CSS class "timelineDate") whenever the date changes.
  1210   1210     @ With the "YYYY-MM-DD HH:MM" and "YYMMDD ..." formats, the complete date
  1211   1211     @ and time is shown on every timeline entry (using the CSS class "timelineTime").</p>
  1212   1212   
  1213   1213     @ <hr />
  1214   1214     onoff_attribute("Show version differences by default",
  1215   1215                     "show-version-diffs", "vdiff", 0, 0);
  1216         -  @ <p>On the version-information pages linked from the timeline can either
         1216  +  @ <p>The version-information pages linked from the timeline can either
  1217   1217     @ show complete diffs of all file changes, or can just list the names of
  1218   1218     @ the files that have changed.  Users can get to either page by
  1219   1219     @ clicking.  This setting selects the default.</p>
  1220   1220   
  1221   1221     @ <hr />
  1222   1222     entry_attribute("Max timeline comment length", 6,
  1223   1223                     "timeline-max-comment", "tmc", "0", 0);

Changes to src/timeline.c.

   587    587     int omitDescenders,       /* True to omit descenders */
   588    588     int fileDiff              /* True for file diff.  False for check-in diff */
   589    589   ){
   590    590     if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
   591    591       GraphRow *pRow;
   592    592       int i;
   593    593       char cSep;
          594  +    
   594    595       @ <script  type="text/JavaScript">
   595    596       @ /* <![CDATA[ */
   596    597       @ var railPitch=%d(pGraph->iRailPitch);
   597    598   
   598    599       /* the rowinfo[] array contains all the information needed to generate
   599    600       ** the graph.  Each entry contains information for a single row:
   600    601       **
................................................................................
   848    849       @     canvasDiv.removeChild(selBox);
   849    850       @     selBox = null;
   850    851       @     selRow = null;
   851    852       @   }else{
   852    853       if( fileDiff ){
   853    854         @     location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
   854    855       }else{
   855         -      @     location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
          856  +      if( db_get_boolean("show-version-diffs", 0)==0 ){
          857  +        @     location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=0";
          858  +      }else{
          859  +        @     location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
          860  +      }
   856    861       }
   857    862       @   }
   858    863       @ }
   859    864       @ var lastId = "m"+rowinfo[rowinfo.length-1].id;
   860    865       @ var lastY = 0;
   861    866       @ function checkHeight(){
   862    867       @   var h = absoluteY(lastId);