Fossil SCM
Add the "Patch" submenu element on the "/vdiff" page. Improved the documentation for /vdiff.
Commit
e707906a8a1e7e3b614276e26eaa656767fb0f29
Parent
fc6bb9368953e5b…
1 file changed
+9
-6
+9
-6
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -933,16 +933,16 @@ | ||
| 933 | 933 | ** WEBPAGE: vdiff |
| 934 | 934 | ** URL: /vdiff |
| 935 | 935 | ** |
| 936 | 936 | ** Query parameters: |
| 937 | 937 | ** |
| 938 | -** from=TAG | |
| 939 | -** to=TAG | |
| 940 | -** branch=TAG | |
| 941 | -** v=BOOLEAN | |
| 942 | -** sbs=BOOLEAN | |
| 943 | -** glob=STRING only diff files matching this glob | |
| 938 | +** from=TAG Left side of the comparison | |
| 939 | +** to=TAG Right side of the comparison | |
| 940 | +** branch=TAG Show all changes on a particular branch | |
| 941 | +** v=BOOLEAN Default true. If false, only list files that have changed | |
| 942 | +** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false | |
| 943 | +** glob=STRING only diff files matching this glob | |
| 944 | 944 | ** |
| 945 | 945 | ** |
| 946 | 946 | ** Show all differences between two checkins. |
| 947 | 947 | */ |
| 948 | 948 | void vdiff_page(void){ |
| @@ -1013,10 +1013,13 @@ | ||
| 1013 | 1013 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1014 | 1014 | if( zGlob ){ |
| 1015 | 1015 | style_submenu_element("Clear glob", "clearglob", |
| 1016 | 1016 | "%R/vdiff?from=%T&to=%T&sbs=%d%s", zFrom, zTo, |
| 1017 | 1017 | sideBySide, (verboseFlag && !sideBySide)?"&v":""); |
| 1018 | + }else{ | |
| 1019 | + style_submenu_element("Patch", "patch", | |
| 1020 | + "%R/vpatch?from=%T&to=%T", zFrom, zTo); | |
| 1018 | 1021 | } |
| 1019 | 1022 | style_header("Check-in Differences"); |
| 1020 | 1023 | @ <h2>Difference From:</h2><blockquote> |
| 1021 | 1024 | checkin_description(ridFrom); |
| 1022 | 1025 | @ </blockquote><h2>To:</h2><blockquote> |
| 1023 | 1026 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -933,16 +933,16 @@ | |
| 933 | ** WEBPAGE: vdiff |
| 934 | ** URL: /vdiff |
| 935 | ** |
| 936 | ** Query parameters: |
| 937 | ** |
| 938 | ** from=TAG |
| 939 | ** to=TAG |
| 940 | ** branch=TAG |
| 941 | ** v=BOOLEAN |
| 942 | ** sbs=BOOLEAN |
| 943 | ** glob=STRING only diff files matching this glob |
| 944 | ** |
| 945 | ** |
| 946 | ** Show all differences between two checkins. |
| 947 | */ |
| 948 | void vdiff_page(void){ |
| @@ -1013,10 +1013,13 @@ | |
| 1013 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1014 | if( zGlob ){ |
| 1015 | style_submenu_element("Clear glob", "clearglob", |
| 1016 | "%R/vdiff?from=%T&to=%T&sbs=%d%s", zFrom, zTo, |
| 1017 | sideBySide, (verboseFlag && !sideBySide)?"&v":""); |
| 1018 | } |
| 1019 | style_header("Check-in Differences"); |
| 1020 | @ <h2>Difference From:</h2><blockquote> |
| 1021 | checkin_description(ridFrom); |
| 1022 | @ </blockquote><h2>To:</h2><blockquote> |
| 1023 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -933,16 +933,16 @@ | |
| 933 | ** WEBPAGE: vdiff |
| 934 | ** URL: /vdiff |
| 935 | ** |
| 936 | ** Query parameters: |
| 937 | ** |
| 938 | ** from=TAG Left side of the comparison |
| 939 | ** to=TAG Right side of the comparison |
| 940 | ** branch=TAG Show all changes on a particular branch |
| 941 | ** v=BOOLEAN Default true. If false, only list files that have changed |
| 942 | ** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false |
| 943 | ** glob=STRING only diff files matching this glob |
| 944 | ** |
| 945 | ** |
| 946 | ** Show all differences between two checkins. |
| 947 | */ |
| 948 | void vdiff_page(void){ |
| @@ -1013,10 +1013,13 @@ | |
| 1013 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1014 | if( zGlob ){ |
| 1015 | style_submenu_element("Clear glob", "clearglob", |
| 1016 | "%R/vdiff?from=%T&to=%T&sbs=%d%s", zFrom, zTo, |
| 1017 | sideBySide, (verboseFlag && !sideBySide)?"&v":""); |
| 1018 | }else{ |
| 1019 | style_submenu_element("Patch", "patch", |
| 1020 | "%R/vpatch?from=%T&to=%T", zFrom, zTo); |
| 1021 | } |
| 1022 | style_header("Check-in Differences"); |
| 1023 | @ <h2>Difference From:</h2><blockquote> |
| 1024 | checkin_description(ridFrom); |
| 1025 | @ </blockquote><h2>To:</h2><blockquote> |
| 1026 |