Fossil SCM
Fixing the vdiff submenus, so they behave as usual (for this branch)
Commit
4cf8c3d348a5fe6c1be2819ccd9072736dc6dbdc
Parent
e29d3822e9f0605…
1 file changed
+5
-5
+5
-5
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -946,21 +946,21 @@ | ||
| 946 | 946 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 947 | 947 | g.zTop, zFrom, zTo); |
| 948 | 948 | } |
| 949 | 949 | if( !showDetail || sideBySide ){ |
| 950 | 950 | style_submenu_element("Unified Diff", "udiff", |
| 951 | - "%R/vdiff?from=%T&to=%T&detail=%d&sbs=0", | |
| 952 | - zFrom, zTo, showDetail); | |
| 951 | + "%R/vdiff?from=%T&to=%T&detail=1&sbs=0", | |
| 952 | + zFrom, zTo); | |
| 953 | 953 | } |
| 954 | 954 | if (!sideBySide){ |
| 955 | 955 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 956 | - "%R/vdiff?from=%T&to=%T&detail=%d&sbs=1", | |
| 957 | - zFrom, zTo, showDetail); | |
| 956 | + "%R/vdiff?from=%T&to=%T&detail=1&sbs=1", | |
| 957 | + zFrom, zTo); | |
| 958 | 958 | } |
| 959 | 959 | style_submenu_element("Patch", "patch", |
| 960 | 960 | "%s/vpatch?from=%T&to=%T", |
| 961 | - g.zTop, P("from"), P("to")); | |
| 961 | + g.zTop, zFrom, zTo); | |
| 962 | 962 | style_submenu_element("Invert", "invert", |
| 963 | 963 | "%R/vdiff?from=%T&to=%T&detail=%d&sbs=%d", |
| 964 | 964 | zTo, zFrom, showDetail, sideBySide); |
| 965 | 965 | style_header("Check-in Differences"); |
| 966 | 966 | @ <h2>Difference From:</h2><blockquote> |
| 967 | 967 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -946,21 +946,21 @@ | |
| 946 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 947 | g.zTop, zFrom, zTo); |
| 948 | } |
| 949 | if( !showDetail || sideBySide ){ |
| 950 | style_submenu_element("Unified Diff", "udiff", |
| 951 | "%R/vdiff?from=%T&to=%T&detail=%d&sbs=0", |
| 952 | zFrom, zTo, showDetail); |
| 953 | } |
| 954 | if (!sideBySide){ |
| 955 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 956 | "%R/vdiff?from=%T&to=%T&detail=%d&sbs=1", |
| 957 | zFrom, zTo, showDetail); |
| 958 | } |
| 959 | style_submenu_element("Patch", "patch", |
| 960 | "%s/vpatch?from=%T&to=%T", |
| 961 | g.zTop, P("from"), P("to")); |
| 962 | style_submenu_element("Invert", "invert", |
| 963 | "%R/vdiff?from=%T&to=%T&detail=%d&sbs=%d", |
| 964 | zTo, zFrom, showDetail, sideBySide); |
| 965 | style_header("Check-in Differences"); |
| 966 | @ <h2>Difference From:</h2><blockquote> |
| 967 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -946,21 +946,21 @@ | |
| 946 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 947 | g.zTop, zFrom, zTo); |
| 948 | } |
| 949 | if( !showDetail || sideBySide ){ |
| 950 | style_submenu_element("Unified Diff", "udiff", |
| 951 | "%R/vdiff?from=%T&to=%T&detail=1&sbs=0", |
| 952 | zFrom, zTo); |
| 953 | } |
| 954 | if (!sideBySide){ |
| 955 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 956 | "%R/vdiff?from=%T&to=%T&detail=1&sbs=1", |
| 957 | zFrom, zTo); |
| 958 | } |
| 959 | style_submenu_element("Patch", "patch", |
| 960 | "%s/vpatch?from=%T&to=%T", |
| 961 | g.zTop, zFrom, zTo); |
| 962 | style_submenu_element("Invert", "invert", |
| 963 | "%R/vdiff?from=%T&to=%T&detail=%d&sbs=%d", |
| 964 | zTo, zFrom, showDetail, sideBySide); |
| 965 | style_header("Check-in Differences"); |
| 966 | @ <h2>Difference From:</h2><blockquote> |
| 967 |