Changes On Branch rons diff mods
Not logged in

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

Changes In Branch rons diff mods Excluding Merge-Ins

This is equivalent to a diff from b72eb4d4b2 to 6a84934b44

2011-06-23
17:48
Update the build-in SQLite to the lastest 3.7.7 release candidate. check-in: 4722e1ab77 user: drh tags: trunk
11:24
added version diff from info page Leaf check-in: 6a84934b44 user: ron tags: rons diff mods
08:56
added "diff from other version" to fdiff page check-in: b785f08608 user: ron tags: rons diff mods
2011-06-21
11:38
fix [ffa87168ce1] check-in: b72eb4d4b2 user: ron tags: trunk
00:51
Update the built-in SQLite to the latest 3.7.7 release candidate. check-in: 74cbfc69ad user: drh tags: trunk

Changes to src/info.c.

   514    514         if( showDiff ){
   515    515           @ <a href="%s(g.zTop)/ci/%T(zName)">[hide&nbsp;diffs]</a>
   516    516         }else{
   517    517           @ <a href="%s(g.zTop)/vinfo/%T(zName)">[show&nbsp;diffs]</a>
   518    518         }
   519    519       }
   520    520       @ &nbsp;&nbsp;
   521         -    @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/>
          521  +    @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a>
          522  +	@ <form method="get" action="%s(g.zTop)/vdiff">
          523  +	@   See difference from another version: 
          524  +	@   <input type="text" name="to"/>
          525  +	@   <input type="hidden" name="from" value="%S(zParent)"/>
          526  +	@   &nbsp; <input type="submit" />
          527  +	@ </form><br/>
   522    528       db_prepare(&q,
   523    529          "SELECT name,"
   524    530          "       mperm,"
   525    531          "       (SELECT uuid FROM blob WHERE rid=mlink.pid),"
   526    532          "       (SELECT uuid FROM blob WHERE rid=mlink.fid),"
   527    533          "       (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
   528    534          "  FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
................................................................................
   993    999       @ <blockquote><p>
   994   1000       object_description(v1, 1, 0);
   995   1001       @ </p></blockquote>
   996   1002       @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2>
   997   1003       @ <blockquote><p>
   998   1004       object_description(v2, 1, 0);
   999   1005       @ </p></blockquote>
         1006  +    @ <hr />
         1007  +	@ <form method="get" action="%s(g.zTop)/fdiff">
         1008  +	@   See difference from another version: 
         1009  +	@   <input type="text" name="v2"/>
         1010  +	@   <input type="hidden" name="v1" value="%s(zV1)"/>
         1011  +	@   &nbsp; <input type="submit" />
         1012  +	@ </form>
  1000   1013       @ <hr />
  1001   1014       @ <blockquote><pre>
  1002   1015       @ %h(blob_str(&diff))
  1003   1016       @ </pre></blockquote>
  1004   1017       blob_reset(&diff);
  1005   1018       style_footer();
  1006   1019     }