Fossil SCM
Add button to toggle sbsdiff for /fdiff views.
Commit
d0988fb5bb0cfbee48f5ac4e95b68049b3a240c8
Parent
15de70c21ffdf8e…
1 file changed
+10
+10
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1063,10 +1063,20 @@ | ||
| 1063 | 1063 | } |
| 1064 | 1064 | if( !isPatch ){ |
| 1065 | 1065 | style_header("Diff"); |
| 1066 | 1066 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1067 | 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 | + | |
| 1068 | 1078 | @ <h2>Differences From |
| 1069 | 1079 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1070 | 1080 | object_description(v1, 0, 0); |
| 1071 | 1081 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1072 | 1082 | object_description(v2, 0, 0); |
| 1073 | 1083 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1063,10 +1063,20 @@ | |
| 1063 | } |
| 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 | @ <h2>Differences From |
| 1069 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1070 | object_description(v1, 0, 0); |
| 1071 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1072 | object_description(v2, 0, 0); |
| 1073 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1063,10 +1063,20 @@ | |
| 1063 | } |
| 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 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1082 | object_description(v2, 0, 0); |
| 1083 |