Fossil SCM
Adding a link to vpatch in vdiff.
Commit
e926e0b467ea16cee6502eef8c4503500714bb55
Parent
dc313b1547d13a5…
1 file changed
+14
-17
+14
-17
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -787,31 +787,28 @@ | ||
| 787 | 787 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 788 | 788 | if( pTo==0 ) return; |
| 789 | 789 | sideBySide = atoi(PD("sbs","1")); |
| 790 | 790 | showDetail = atoi(PD("detail","0")); |
| 791 | 791 | if( !showDetail && sideBySide ) showDetail = 1; |
| 792 | - if( !sideBySide ){ | |
| 793 | - style_submenu_element("Side-by-side Diff", "sbsdiff", | |
| 794 | - "%s/vdiff?from=%T&to=%T&detail=1&sbs=1", | |
| 795 | - g.zTop, P("from"), P("to")); | |
| 796 | - if (showDetail){ | |
| 797 | - style_submenu_element("Abstract", "abstract", | |
| 798 | - "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", | |
| 799 | - g.zTop, P("from"), P("to")); | |
| 800 | - }else{ | |
| 801 | - style_submenu_element("Unified Diff", "udiff", | |
| 802 | - "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", | |
| 803 | - g.zTop, P("from"), P("to")); | |
| 804 | - } | |
| 805 | - }else{ | |
| 806 | - style_submenu_element("Unified Diff", "udiff", | |
| 807 | - "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", | |
| 808 | - g.zTop, P("from"), P("to")); | |
| 792 | + if (showDetail){ | |
| 809 | 793 | style_submenu_element("Abstract", "abstract", |
| 810 | 794 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 811 | 795 | g.zTop, P("from"), P("to")); |
| 812 | 796 | } |
| 797 | + if( !showDetail || sideBySide ){ | |
| 798 | + style_submenu_element("Unified Diff", "udiff", | |
| 799 | + "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", | |
| 800 | + g.zTop, P("from"), P("to")); | |
| 801 | + } | |
| 802 | + if (!sideBySide){ | |
| 803 | + style_submenu_element("Side-by-side Diff", "sbsdiff", | |
| 804 | + "%s/vdiff?from=%T&to=%T&detail=1&sbs=1", | |
| 805 | + g.zTop, P("from"), P("to")); | |
| 806 | + } | |
| 807 | + style_submenu_element("Patch", "patch", | |
| 808 | + "%s/vpatch?from=%T&to=%T", | |
| 809 | + g.zTop, P("from"), P("to")); | |
| 813 | 810 | style_header("Check-in Differences"); |
| 814 | 811 | @ <h2>Difference From:</h2><blockquote> |
| 815 | 812 | checkin_description(ridFrom); |
| 816 | 813 | @ </blockquote><h2>To:</h2><blockquote> |
| 817 | 814 | checkin_description(ridTo); |
| 818 | 815 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -787,31 +787,28 @@ | |
| 787 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 788 | if( pTo==0 ) return; |
| 789 | sideBySide = atoi(PD("sbs","1")); |
| 790 | showDetail = atoi(PD("detail","0")); |
| 791 | if( !showDetail && sideBySide ) showDetail = 1; |
| 792 | if( !sideBySide ){ |
| 793 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 794 | "%s/vdiff?from=%T&to=%T&detail=1&sbs=1", |
| 795 | g.zTop, P("from"), P("to")); |
| 796 | if (showDetail){ |
| 797 | style_submenu_element("Abstract", "abstract", |
| 798 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 799 | g.zTop, P("from"), P("to")); |
| 800 | }else{ |
| 801 | style_submenu_element("Unified Diff", "udiff", |
| 802 | "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", |
| 803 | g.zTop, P("from"), P("to")); |
| 804 | } |
| 805 | }else{ |
| 806 | style_submenu_element("Unified Diff", "udiff", |
| 807 | "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", |
| 808 | g.zTop, P("from"), P("to")); |
| 809 | style_submenu_element("Abstract", "abstract", |
| 810 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 811 | g.zTop, P("from"), P("to")); |
| 812 | } |
| 813 | style_header("Check-in Differences"); |
| 814 | @ <h2>Difference From:</h2><blockquote> |
| 815 | checkin_description(ridFrom); |
| 816 | @ </blockquote><h2>To:</h2><blockquote> |
| 817 | checkin_description(ridTo); |
| 818 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -787,31 +787,28 @@ | |
| 787 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 788 | if( pTo==0 ) return; |
| 789 | sideBySide = atoi(PD("sbs","1")); |
| 790 | showDetail = atoi(PD("detail","0")); |
| 791 | if( !showDetail && sideBySide ) showDetail = 1; |
| 792 | if (showDetail){ |
| 793 | style_submenu_element("Abstract", "abstract", |
| 794 | "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", |
| 795 | g.zTop, P("from"), P("to")); |
| 796 | } |
| 797 | if( !showDetail || sideBySide ){ |
| 798 | style_submenu_element("Unified Diff", "udiff", |
| 799 | "%s/vdiff?from=%T&to=%T&detail=1&sbs=0", |
| 800 | g.zTop, P("from"), P("to")); |
| 801 | } |
| 802 | if (!sideBySide){ |
| 803 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 804 | "%s/vdiff?from=%T&to=%T&detail=1&sbs=1", |
| 805 | g.zTop, P("from"), P("to")); |
| 806 | } |
| 807 | style_submenu_element("Patch", "patch", |
| 808 | "%s/vpatch?from=%T&to=%T", |
| 809 | g.zTop, P("from"), P("to")); |
| 810 | style_header("Check-in Differences"); |
| 811 | @ <h2>Difference From:</h2><blockquote> |
| 812 | checkin_description(ridFrom); |
| 813 | @ </blockquote><h2>To:</h2><blockquote> |
| 814 | checkin_description(ridTo); |
| 815 |