Fossil SCM
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.
Commit
4e4d0fa5278d9080ddb6033de2a0f1ca9e4eaaf1
Parent
5214a2a8b894b7b…
1 file changed
+8
-7
+8
-7
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -927,20 +927,21 @@ | ||
| 927 | 927 | if( !verboseFlag && sideBySide ) verboseFlag = 1; |
| 928 | 928 | zFrom = P("from"); |
| 929 | 929 | zTo = P("to"); |
| 930 | 930 | if( !sideBySide ){ |
| 931 | 931 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 932 | - "%R/vdiff?from=%T&to=%T%s&sbs=1", | |
| 933 | - zFrom, zTo, verboseFlag?"&v=1":""); | |
| 934 | - }else{ | |
| 932 | + "%R/vdiff?from=%T&to=%T&sbs=1", | |
| 933 | + zFrom, zTo); | |
| 934 | + } | |
| 935 | + if( sideBySide || !verboseFlag ) { | |
| 935 | 936 | style_submenu_element("Unified Diff", "udiff", |
| 936 | - "%R/vdiff?from=%T&to=%T%s&sbs=0", | |
| 937 | - zFrom, zTo, verboseFlag?"&v=1":""); | |
| 937 | + "%R/vdiff?from=%T&to=%T%s&sbs=0&v=1", | |
| 938 | + zFrom, zTo); | |
| 938 | 939 | } |
| 939 | 940 | style_submenu_element("Invert", "invert", |
| 940 | - "%R/vdiff?from=%T&to=%T%s&sbs=%d", | |
| 941 | - zTo, zFrom, verboseFlag?"&v=1":"", sideBySide); | |
| 941 | + "%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom, | |
| 942 | + sideBySide, (verboseFlag && !sideBySide)?"&v=1":""); | |
| 942 | 943 | style_header("Check-in Differences"); |
| 943 | 944 | @ <h2>Difference From:</h2><blockquote> |
| 944 | 945 | checkin_description(ridFrom); |
| 945 | 946 | @ </blockquote><h2>To:</h2><blockquote> |
| 946 | 947 | checkin_description(ridTo); |
| 947 | 948 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -927,20 +927,21 @@ | |
| 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 | "%R/vdiff?from=%T&to=%T%s&sbs=1", |
| 933 | zFrom, zTo, verboseFlag?"&v=1":""); |
| 934 | }else{ |
| 935 | style_submenu_element("Unified Diff", "udiff", |
| 936 | "%R/vdiff?from=%T&to=%T%s&sbs=0", |
| 937 | zFrom, zTo, verboseFlag?"&v=1":""); |
| 938 | } |
| 939 | style_submenu_element("Invert", "invert", |
| 940 | "%R/vdiff?from=%T&to=%T%s&sbs=%d", |
| 941 | zTo, zFrom, verboseFlag?"&v=1":"", sideBySide); |
| 942 | style_header("Check-in Differences"); |
| 943 | @ <h2>Difference From:</h2><blockquote> |
| 944 | checkin_description(ridFrom); |
| 945 | @ </blockquote><h2>To:</h2><blockquote> |
| 946 | checkin_description(ridTo); |
| 947 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -927,20 +927,21 @@ | |
| 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 | "%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%s&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 |