Fossil SCM

On the /vdiff web-page, presence of "v" should mean "v=1", just as on the /event and /timeline web-pages. Add "&sbs=1" in various /vdiff and /fdiff url's, so it no longer depends on the default value. Replace some "v=1" parameters with the short form "v".

jan.nijtmans 2013-05-06 09:40 trunk
Commit d24afd17c6e20a2968b400d37c6636194630cc2f
Parent bff7f5b95ed2054…
3 files changed +1 -1 +4 -4 +3 -3
~ src/finfo.c ~ src/info.c ~ src/timeline.c
M src/finfo.c
+1 -1
--- src/finfo.c
+++ src/finfo.c
@@ -424,11 +424,11 @@
424424
 hyperlink_to_user(zUser, zDate, "");
425425
 @ branch: %h(zBr))
426426
 if( g.perm.Hyperlink && zUuid ){
427427
 const char *z = zFilename;
428428
 if( fpid ){
429
- @ %z(href("%R/fdiff?v1=%S&v2=%S",zPUuid,zUuid))[diff]</a>
429
+ @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zPUuid,zUuid))[diff]</a>
430430
 }
431431
 @ %z(href("%R/annotate?checkin=%S&filename=%h",zCkin,z))
432432
 @ [annotate]</a>
433433
 @ %z(href("%R/timeline?n=200&uf=%S",zUuid))[checkins&nbsp;using]</a>
434434
 }
435435
--- src/finfo.c
+++ src/finfo.c
@@ -424,11 +424,11 @@
424 hyperlink_to_user(zUser, zDate, "");
425 @ branch: %h(zBr))
426 if( g.perm.Hyperlink && zUuid ){
427 const char *z = zFilename;
428 if( fpid ){
429 @ %z(href("%R/fdiff?v1=%S&v2=%S",zPUuid,zUuid))[diff]</a>
430 }
431 @ %z(href("%R/annotate?checkin=%S&filename=%h",zCkin,z))
432 @ [annotate]</a>
433 @ %z(href("%R/timeline?n=200&uf=%S",zUuid))[checkins&nbsp;using]</a>
434 }
435
--- src/finfo.c
+++ src/finfo.c
@@ -424,11 +424,11 @@
424 hyperlink_to_user(zUser, zDate, "");
425 @ branch: %h(zBr))
426 if( g.perm.Hyperlink && zUuid ){
427 const char *z = zFilename;
428 if( fpid ){
429 @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zPUuid,zUuid))[diff]</a>
430 }
431 @ %z(href("%R/annotate?checkin=%S&filename=%h",zCkin,z))
432 @ [annotate]</a>
433 @ %z(href("%R/timeline?n=200&uf=%S",zUuid))[checkins&nbsp;using]</a>
434 }
435
M src/info.c
+4 -4
--- src/info.c
+++ src/info.c
@@ -390,11 +390,11 @@
390390
 @ <pre style="white-space:pre;">
391391
 append_diff(zOld, zNew, diffFlags, pRe);
392392
 @ </pre>
393393
 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394394
 @ &nbsp;&nbsp;
395
- @ %z(href("%R/fdiff?v1=%S&v2=%S",zOld,zNew))[diff]</a>
395
+ @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a>
396396
 }
397397
 @ </p>
398398
 }
399399
 }
400400
@@ -921,11 +921,11 @@
921921
 zVerbose = P("verbose");
922922
 }
923923
 if( !zVerbose ){
924924
 zVerbose = P("detail"); /* deprecated */
925925
 }
926
- verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
926
+ verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
927927
 if( !verboseFlag && sideBySide ) verboseFlag = 1;
928928
 zFrom = P("from");
929929
 zTo = P("to");
930930
 if( !sideBySide ){
931931
 style_submenu_element("Side-by-side Diff", "sbsdiff",
@@ -932,16 +932,16 @@
932932
 "%R/vdiff?from=%T&to=%T&sbs=1",
933933
 zFrom, zTo);
934934
 }
935935
 if( sideBySide || !verboseFlag ) {
936936
 style_submenu_element("Unified Diff", "udiff",
937
- "%R/vdiff?from=%T&to=%T&sbs=0&v=1",
937
+ "%R/vdiff?from=%T&to=%T&sbs=0&v",
938938
 zFrom, zTo);
939939
 }
940940
 style_submenu_element("Invert", "invert",
941941
 "%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
942
- sideBySide, (verboseFlag && !sideBySide)?"&v=1":"");
942
+ sideBySide, (verboseFlag && !sideBySide)?"&v":"");
943943
 style_header("Check-in Differences");
944944
 @ <h2>Difference From:</h2><blockquote>
945945
 checkin_description(ridFrom);
946946
 @ </blockquote><h2>To:</h2><blockquote>
947947
 checkin_description(ridTo);
948948
--- src/info.c
+++ src/info.c
@@ -390,11 +390,11 @@
390 @ <pre style="white-space:pre;">
391 append_diff(zOld, zNew, diffFlags, pRe);
392 @ </pre>
393 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394 @ &nbsp;&nbsp;
395 @ %z(href("%R/fdiff?v1=%S&v2=%S",zOld,zNew))[diff]</a>
396 }
397 @ </p>
398 }
399 }
400
@@ -921,11 +921,11 @@
921 zVerbose = P("verbose");
922 }
923 if( !zVerbose ){
924 zVerbose = P("detail"); /* deprecated */
925 }
926 verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
927 if( !verboseFlag && sideBySide ) verboseFlag = 1;
928 zFrom = P("from");
929 zTo = P("to");
930 if( !sideBySide ){
931 style_submenu_element("Side-by-side Diff", "sbsdiff",
@@ -932,16 +932,16 @@
932 "%R/vdiff?from=%T&to=%T&sbs=1",
933 zFrom, zTo);
934 }
935 if( sideBySide || !verboseFlag ) {
936 style_submenu_element("Unified Diff", "udiff",
937 "%R/vdiff?from=%T&to=%T&sbs=0&v=1",
938 zFrom, zTo);
939 }
940 style_submenu_element("Invert", "invert",
941 "%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
942 sideBySide, (verboseFlag && !sideBySide)?"&v=1":"");
943 style_header("Check-in Differences");
944 @ <h2>Difference From:</h2><blockquote>
945 checkin_description(ridFrom);
946 @ </blockquote><h2>To:</h2><blockquote>
947 checkin_description(ridTo);
948
--- src/info.c
+++ src/info.c
@@ -390,11 +390,11 @@
390 @ <pre style="white-space:pre;">
391 append_diff(zOld, zNew, diffFlags, pRe);
392 @ </pre>
393 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394 @ &nbsp;&nbsp;
395 @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a>
396 }
397 @ </p>
398 }
399 }
400
@@ -921,11 +921,11 @@
921 zVerbose = P("verbose");
922 }
923 if( !zVerbose ){
924 zVerbose = P("detail"); /* deprecated */
925 }
926 verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
927 if( !verboseFlag && sideBySide ) verboseFlag = 1;
928 zFrom = P("from");
929 zTo = P("to");
930 if( !sideBySide ){
931 style_submenu_element("Side-by-side Diff", "sbsdiff",
@@ -932,16 +932,16 @@
932 "%R/vdiff?from=%T&to=%T&sbs=1",
933 zFrom, zTo);
934 }
935 if( sideBySide || !verboseFlag ) {
936 style_submenu_element("Unified Diff", "udiff",
937 "%R/vdiff?from=%T&to=%T&sbs=0&v",
938 zFrom, zTo);
939 }
940 style_submenu_element("Invert", "invert",
941 "%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
942 sideBySide, (verboseFlag && !sideBySide)?"&v":"");
943 style_header("Check-in Differences");
944 @ <h2>Difference From:</h2><blockquote>
945 checkin_description(ridFrom);
946 @ </blockquote><h2>To:</h2><blockquote>
947 checkin_description(ridTo);
948
M src/timeline.c
+3 -3
--- src/timeline.c
+++ src/timeline.c
@@ -511,11 +511,11 @@
511511
 if( zOldName!=0 ){
512512
 @ <li> %h(zOldName) &rarr; %h(zFilename)
513513
 }else{
514514
 @ <li> %h(zFilename) &nbsp;
515515
 }
516
- @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S",zOld,zNew))
516
+ @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))
517517
 @ [diff]</a></li>
518518
 }
519519
 }
520520
 db_reset(&fchngQuery);
521521
 if( inUl ){
@@ -815,13 +815,13 @@
815815
 @ canvasDiv.removeChild(selBox);
816816
 @ selBox = null;
817817
 @ selRow = null;
818818
 @ }else{
819819
 if( fileDiff ){
820
- @ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h;
820
+ @ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
821821
 }else{
822
- @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h;
822
+ @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
823823
 }
824824
 @ }
825825
 @ }
826826
 @ var lastId = "m"+rowinfo[rowinfo.length-1].id;
827827
 @ var lastY = 0;
828828
--- src/timeline.c
+++ src/timeline.c
@@ -511,11 +511,11 @@
511 if( zOldName!=0 ){
512 @ <li> %h(zOldName) &rarr; %h(zFilename)
513 }else{
514 @ <li> %h(zFilename) &nbsp;
515 }
516 @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S",zOld,zNew))
517 @ [diff]</a></li>
518 }
519 }
520 db_reset(&fchngQuery);
521 if( inUl ){
@@ -815,13 +815,13 @@
815 @ canvasDiv.removeChild(selBox);
816 @ selBox = null;
817 @ selRow = null;
818 @ }else{
819 if( fileDiff ){
820 @ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h;
821 }else{
822 @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h;
823 }
824 @ }
825 @ }
826 @ var lastId = "m"+rowinfo[rowinfo.length-1].id;
827 @ var lastY = 0;
828
--- src/timeline.c
+++ src/timeline.c
@@ -511,11 +511,11 @@
511 if( zOldName!=0 ){
512 @ <li> %h(zOldName) &rarr; %h(zFilename)
513 }else{
514 @ <li> %h(zFilename) &nbsp;
515 }
516 @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))
517 @ [diff]</a></li>
518 }
519 }
520 db_reset(&fchngQuery);
521 if( inUl ){
@@ -815,13 +815,13 @@
815 @ canvasDiv.removeChild(selBox);
816 @ selBox = null;
817 @ selRow = null;
818 @ }else{
819 if( fileDiff ){
820 @ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
821 }else{
822 @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
823 }
824 @ }
825 @ }
826 @ var lastId = "m"+rowinfo[rowinfo.length-1].id;
827 @ var lastY = 0;
828

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button