Fossil SCM
Add button to toggle sbsdiff for /vdiff views. Renamed the button in /fdiff.
Commit
d1f63cd8233e23482b5352af149e6c80567bee09
Parent
d0988fb5bb0cfbe…
1 file changed
+13
-6
+13
-6
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -748,10 +748,19 @@ | ||
| 748 | 748 | if( pFrom==0 ) return; |
| 749 | 749 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 750 | 750 | if( pTo==0 ) return; |
| 751 | 751 | showDetail = atoi(PD("detail","0")); |
| 752 | 752 | sideBySide = atoi(PD("sbs","1")); |
| 753 | + if( !sideBySide ){ | |
| 754 | + style_submenu_element("2-Pane Diff", "TPD", | |
| 755 | + "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", | |
| 756 | + g.zTop, P("from"), P("to"), showDetail); | |
| 757 | + }else{ | |
| 758 | + style_submenu_element("1-Pane Diff", "OPD", | |
| 759 | + "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", | |
| 760 | + g.zTop, P("from"), P("to"), showDetail); | |
| 761 | + } | |
| 753 | 762 | style_header("Check-in Differences"); |
| 754 | 763 | @ <h2>Difference From:</h2><blockquote> |
| 755 | 764 | checkin_description(ridFrom); |
| 756 | 765 | @ </blockquote><h2>To:</h2><blockquote> |
| 757 | 766 | checkin_description(ridTo); |
| @@ -1064,17 +1073,15 @@ | ||
| 1064 | 1073 | if( !isPatch ){ |
| 1065 | 1074 | style_header("Diff"); |
| 1066 | 1075 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1067 | 1076 | g.zTop, P("v1"), P("v2")); |
| 1068 | 1077 | if( !sideBySide ){ |
| 1069 | - style_submenu_element("2 Pane Diff", "TPD", | |
| 1070 | - "%s/fdiff?v1=%T&v2=%T&sbs=1", g.zTop, | |
| 1071 | - P("v1"), P("v2")); | |
| 1078 | + style_submenu_element("2-Pane Diff", "TPD", "%s/fdiff?v1=%T&v2=%T&sbs=1", | |
| 1079 | + g.zTop, P("v1"), P("v2")); | |
| 1072 | 1080 | }else{ |
| 1073 | - style_submenu_element("1 Pane Diff", "OPD", | |
| 1074 | - "%s/fdiff?v1=%T&v2=%T&sbs=0", g.zTop, | |
| 1075 | - P("v1"), P("v2")); | |
| 1081 | + style_submenu_element("1-Pane Diff", "OPD", "%s/fdiff?v1=%T&v2=%T&sbs=0", | |
| 1082 | + g.zTop, P("v1"), P("v2")); | |
| 1076 | 1083 | } |
| 1077 | 1084 | |
| 1078 | 1085 | @ <h2>Differences From |
| 1079 | 1086 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1080 | 1087 | object_description(v1, 0, 0); |
| 1081 | 1088 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -748,10 +748,19 @@ | |
| 748 | if( pFrom==0 ) return; |
| 749 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 750 | if( pTo==0 ) return; |
| 751 | showDetail = atoi(PD("detail","0")); |
| 752 | sideBySide = atoi(PD("sbs","1")); |
| 753 | style_header("Check-in Differences"); |
| 754 | @ <h2>Difference From:</h2><blockquote> |
| 755 | checkin_description(ridFrom); |
| 756 | @ </blockquote><h2>To:</h2><blockquote> |
| 757 | checkin_description(ridTo); |
| @@ -1064,17 +1073,15 @@ | |
| 1064 | if( !isPatch ){ |
| 1065 | style_header("Diff"); |
| 1066 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1067 | g.zTop, P("v1"), P("v2")); |
| 1068 | if( !sideBySide ){ |
| 1069 | style_submenu_element("2 Pane Diff", "TPD", |
| 1070 | "%s/fdiff?v1=%T&v2=%T&sbs=1", g.zTop, |
| 1071 | P("v1"), P("v2")); |
| 1072 | }else{ |
| 1073 | style_submenu_element("1 Pane Diff", "OPD", |
| 1074 | "%s/fdiff?v1=%T&v2=%T&sbs=0", g.zTop, |
| 1075 | P("v1"), P("v2")); |
| 1076 | } |
| 1077 | |
| 1078 | @ <h2>Differences From |
| 1079 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1080 | object_description(v1, 0, 0); |
| 1081 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -748,10 +748,19 @@ | |
| 748 | if( pFrom==0 ) return; |
| 749 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 750 | if( pTo==0 ) return; |
| 751 | showDetail = atoi(PD("detail","0")); |
| 752 | sideBySide = atoi(PD("sbs","1")); |
| 753 | if( !sideBySide ){ |
| 754 | style_submenu_element("2-Pane Diff", "TPD", |
| 755 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", |
| 756 | g.zTop, P("from"), P("to"), showDetail); |
| 757 | }else{ |
| 758 | style_submenu_element("1-Pane Diff", "OPD", |
| 759 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", |
| 760 | g.zTop, P("from"), P("to"), showDetail); |
| 761 | } |
| 762 | style_header("Check-in Differences"); |
| 763 | @ <h2>Difference From:</h2><blockquote> |
| 764 | checkin_description(ridFrom); |
| 765 | @ </blockquote><h2>To:</h2><blockquote> |
| 766 | checkin_description(ridTo); |
| @@ -1064,17 +1073,15 @@ | |
| 1073 | if( !isPatch ){ |
| 1074 | style_header("Diff"); |
| 1075 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1076 | g.zTop, P("v1"), P("v2")); |
| 1077 | if( !sideBySide ){ |
| 1078 | style_submenu_element("2-Pane Diff", "TPD", "%s/fdiff?v1=%T&v2=%T&sbs=1", |
| 1079 | g.zTop, P("v1"), P("v2")); |
| 1080 | }else{ |
| 1081 | style_submenu_element("1-Pane Diff", "OPD", "%s/fdiff?v1=%T&v2=%T&sbs=0", |
| 1082 | g.zTop, P("v1"), P("v2")); |
| 1083 | } |
| 1084 | |
| 1085 | @ <h2>Differences From |
| 1086 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1087 | object_description(v1, 0, 0); |
| 1088 |