Fossil SCM
Renamed 1/2-pane diffs to unified and side-by-side in the ui.
Commit
ff9de303e3bfb7d3788c3589a0ed03b17ac850ca
Parent
adace7586eb3336…
1 file changed
+14
-12
+14
-12
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -551,39 +551,39 @@ | ||
| 551 | 551 | if( showDiff ){ |
| 552 | 552 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 553 | 553 | @ |
| 554 | 554 | if( sideBySide ){ |
| 555 | 555 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 556 | - @ [show 1-pane diffs]</a> | |
| 556 | + @ [unified diffs]</a> | |
| 557 | 557 | }else{ |
| 558 | 558 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 559 | - @ [show 2-pane diffs]</a> | |
| 559 | + @ [side-by-side diffs]</a> | |
| 560 | 560 | } |
| 561 | 561 | }else{ |
| 562 | 562 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 563 | - @ [show 1-pane diffs]</a> | |
| 563 | + @ [show unified diffs]</a> | |
| 564 | 564 | @ |
| 565 | 565 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 566 | - @ [show 2-pane diffs]</a> | |
| 566 | + @ [show side-by-side diffs]</a> | |
| 567 | 567 | } |
| 568 | 568 | }else{ |
| 569 | 569 | if( showDiff ){ |
| 570 | 570 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 571 | 571 | @ |
| 572 | 572 | if( sideBySide ){ |
| 573 | 573 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0"> |
| 574 | - @ [show 1-pane diffs]</a> | |
| 574 | + @ [unified diffs]</a> | |
| 575 | 575 | }else{ |
| 576 | 576 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1"> |
| 577 | - @ [show 2-pane diffs]</a> | |
| 577 | + @ [side-by-side diffs]</a> | |
| 578 | 578 | } |
| 579 | 579 | }else{ |
| 580 | 580 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0"> |
| 581 | - @ [show 1-pane diffs]</a> | |
| 581 | + @ [show unified diffs]</a> | |
| 582 | 582 | @ |
| 583 | 583 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1"> |
| 584 | - @ [show 2-pane diffs]</a> | |
| 584 | + @ [show side-by-side diffs]</a> | |
| 585 | 585 | } |
| 586 | 586 | } |
| 587 | 587 | @ |
| 588 | 588 | @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/> |
| 589 | 589 | db_prepare(&q, |
| @@ -774,15 +774,15 @@ | ||
| 774 | 774 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 775 | 775 | if( pTo==0 ) return; |
| 776 | 776 | showDetail = atoi(PD("detail","0")); |
| 777 | 777 | sideBySide = atoi(PD("sbs","1")); |
| 778 | 778 | if( !sideBySide ){ |
| 779 | - style_submenu_element("2-Pane Diff", "TPD", | |
| 779 | + style_submenu_element("Side-by-side Diff", "sbsdiff", | |
| 780 | 780 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", |
| 781 | 781 | g.zTop, P("from"), P("to"), showDetail); |
| 782 | 782 | }else{ |
| 783 | - style_submenu_element("1-Pane Diff", "OPD", | |
| 783 | + style_submenu_element("Unified Diff", "udiff", | |
| 784 | 784 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", |
| 785 | 785 | g.zTop, P("from"), P("to"), showDetail); |
| 786 | 786 | } |
| 787 | 787 | style_header("Check-in Differences"); |
| 788 | 788 | @ <h2>Difference From:</h2><blockquote> |
| @@ -1098,14 +1098,16 @@ | ||
| 1098 | 1098 | if( !isPatch ){ |
| 1099 | 1099 | style_header("Diff"); |
| 1100 | 1100 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1101 | 1101 | g.zTop, P("v1"), P("v2")); |
| 1102 | 1102 | if( !sideBySide ){ |
| 1103 | - style_submenu_element("2-Pane Diff", "TPD", "%s/fdiff?v1=%T&v2=%T&sbs=1", | |
| 1103 | + style_submenu_element("Side-by-side Diff", "sbsdiff", | |
| 1104 | + "%s/fdiff?v1=%T&v2=%T&sbs=1", | |
| 1104 | 1105 | g.zTop, P("v1"), P("v2")); |
| 1105 | 1106 | }else{ |
| 1106 | - style_submenu_element("1-Pane Diff", "OPD", "%s/fdiff?v1=%T&v2=%T&sbs=0", | |
| 1107 | + style_submenu_element("Unified Diff", "udiff", | |
| 1108 | + "%s/fdiff?v1=%T&v2=%T&sbs=0", | |
| 1107 | 1109 | g.zTop, P("v1"), P("v2")); |
| 1108 | 1110 | } |
| 1109 | 1111 | |
| 1110 | 1112 | @ <h2>Differences From |
| 1111 | 1113 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1112 | 1114 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -551,39 +551,39 @@ | |
| 551 | if( showDiff ){ |
| 552 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 553 | @ |
| 554 | if( sideBySide ){ |
| 555 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 556 | @ [show 1-pane diffs]</a> |
| 557 | }else{ |
| 558 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 559 | @ [show 2-pane diffs]</a> |
| 560 | } |
| 561 | }else{ |
| 562 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 563 | @ [show 1-pane diffs]</a> |
| 564 | @ |
| 565 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 566 | @ [show 2-pane diffs]</a> |
| 567 | } |
| 568 | }else{ |
| 569 | if( showDiff ){ |
| 570 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 571 | @ |
| 572 | if( sideBySide ){ |
| 573 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0"> |
| 574 | @ [show 1-pane diffs]</a> |
| 575 | }else{ |
| 576 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1"> |
| 577 | @ [show 2-pane diffs]</a> |
| 578 | } |
| 579 | }else{ |
| 580 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0"> |
| 581 | @ [show 1-pane diffs]</a> |
| 582 | @ |
| 583 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1"> |
| 584 | @ [show 2-pane diffs]</a> |
| 585 | } |
| 586 | } |
| 587 | @ |
| 588 | @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/> |
| 589 | db_prepare(&q, |
| @@ -774,15 +774,15 @@ | |
| 774 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 775 | if( pTo==0 ) return; |
| 776 | showDetail = atoi(PD("detail","0")); |
| 777 | sideBySide = atoi(PD("sbs","1")); |
| 778 | if( !sideBySide ){ |
| 779 | style_submenu_element("2-Pane Diff", "TPD", |
| 780 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", |
| 781 | g.zTop, P("from"), P("to"), showDetail); |
| 782 | }else{ |
| 783 | style_submenu_element("1-Pane Diff", "OPD", |
| 784 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", |
| 785 | g.zTop, P("from"), P("to"), showDetail); |
| 786 | } |
| 787 | style_header("Check-in Differences"); |
| 788 | @ <h2>Difference From:</h2><blockquote> |
| @@ -1098,14 +1098,16 @@ | |
| 1098 | if( !isPatch ){ |
| 1099 | style_header("Diff"); |
| 1100 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1101 | g.zTop, P("v1"), P("v2")); |
| 1102 | if( !sideBySide ){ |
| 1103 | style_submenu_element("2-Pane Diff", "TPD", "%s/fdiff?v1=%T&v2=%T&sbs=1", |
| 1104 | g.zTop, P("v1"), P("v2")); |
| 1105 | }else{ |
| 1106 | style_submenu_element("1-Pane Diff", "OPD", "%s/fdiff?v1=%T&v2=%T&sbs=0", |
| 1107 | g.zTop, P("v1"), P("v2")); |
| 1108 | } |
| 1109 | |
| 1110 | @ <h2>Differences From |
| 1111 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1112 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -551,39 +551,39 @@ | |
| 551 | if( showDiff ){ |
| 552 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 553 | @ |
| 554 | if( sideBySide ){ |
| 555 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 556 | @ [unified diffs]</a> |
| 557 | }else{ |
| 558 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 559 | @ [side-by-side diffs]</a> |
| 560 | } |
| 561 | }else{ |
| 562 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 563 | @ [show unified diffs]</a> |
| 564 | @ |
| 565 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 566 | @ [show side-by-side diffs]</a> |
| 567 | } |
| 568 | }else{ |
| 569 | if( showDiff ){ |
| 570 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 571 | @ |
| 572 | if( sideBySide ){ |
| 573 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0"> |
| 574 | @ [unified diffs]</a> |
| 575 | }else{ |
| 576 | @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1"> |
| 577 | @ [side-by-side diffs]</a> |
| 578 | } |
| 579 | }else{ |
| 580 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0"> |
| 581 | @ [show unified diffs]</a> |
| 582 | @ |
| 583 | @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1"> |
| 584 | @ [show side-by-side diffs]</a> |
| 585 | } |
| 586 | } |
| 587 | @ |
| 588 | @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/> |
| 589 | db_prepare(&q, |
| @@ -774,15 +774,15 @@ | |
| 774 | pTo = vdiff_parse_manifest("to", &ridTo); |
| 775 | if( pTo==0 ) return; |
| 776 | showDetail = atoi(PD("detail","0")); |
| 777 | sideBySide = atoi(PD("sbs","1")); |
| 778 | if( !sideBySide ){ |
| 779 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 780 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", |
| 781 | g.zTop, P("from"), P("to"), showDetail); |
| 782 | }else{ |
| 783 | style_submenu_element("Unified Diff", "udiff", |
| 784 | "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", |
| 785 | g.zTop, P("from"), P("to"), showDetail); |
| 786 | } |
| 787 | style_header("Check-in Differences"); |
| 788 | @ <h2>Difference From:</h2><blockquote> |
| @@ -1098,14 +1098,16 @@ | |
| 1098 | if( !isPatch ){ |
| 1099 | style_header("Diff"); |
| 1100 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1101 | g.zTop, P("v1"), P("v2")); |
| 1102 | if( !sideBySide ){ |
| 1103 | style_submenu_element("Side-by-side Diff", "sbsdiff", |
| 1104 | "%s/fdiff?v1=%T&v2=%T&sbs=1", |
| 1105 | g.zTop, P("v1"), P("v2")); |
| 1106 | }else{ |
| 1107 | style_submenu_element("Unified Diff", "udiff", |
| 1108 | "%s/fdiff?v1=%T&v2=%T&sbs=0", |
| 1109 | g.zTop, P("v1"), P("v2")); |
| 1110 | } |
| 1111 | |
| 1112 | @ <h2>Differences From |
| 1113 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1114 |