Fossil SCM
Add a side-by-side diff option to the skin editor.
Commit
523c548b2e236412acc94fb30f5ecea2da72a785c911c170bedaf9be51655fe6
Parent
c6ee75a912be274…
1 file changed
+4
-2
+4
-2
| --- src/skins.c | ||
| +++ src/skins.c | ||
| @@ -763,15 +763,17 @@ | ||
| 763 | 763 | @ <br /> |
| 764 | 764 | @ <input type="submit" name="submit" value="Apply Changes" /> |
| 765 | 765 | @ <hr /> |
| 766 | 766 | @ Baseline: \ |
| 767 | 767 | skin_emit_skin_selector("basis", zBasis, zDraft); |
| 768 | - @ <input type="submit" name="diff" value="Diff" /> | |
| 769 | - if( P("diff")!=0 ){ | |
| 768 | + @ <input type="submit" name="diff" value="Unified Diff" /> | |
| 769 | + @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" /> | |
| 770 | + if( P("diff")!=0 || P("sbsdiff")!=0 ){ | |
| 770 | 771 | u64 diffFlags = construct_diff_flags(0,0) | |
| 771 | 772 | DIFF_STRIP_EOLCR; |
| 772 | 773 | Blob from, to, out; |
| 774 | + if( P("sbsdiff")!=0 ) diffFlags |= DIFF_SIDEBYSIDE; | |
| 773 | 775 | blob_init(&to, zContent, -1); |
| 774 | 776 | blob_init(&from, skin_file_content(zBasis, zFile), -1); |
| 775 | 777 | blob_zero(&out); |
| 776 | 778 | if( diffFlags & DIFF_SIDEBYSIDE ){ |
| 777 | 779 | text_diff(&from, &to, &out, 0, diffFlags | DIFF_HTML | DIFF_NOTTOOBIG); |
| 778 | 780 |
| --- src/skins.c | |
| +++ src/skins.c | |
| @@ -763,15 +763,17 @@ | |
| 763 | @ <br /> |
| 764 | @ <input type="submit" name="submit" value="Apply Changes" /> |
| 765 | @ <hr /> |
| 766 | @ Baseline: \ |
| 767 | skin_emit_skin_selector("basis", zBasis, zDraft); |
| 768 | @ <input type="submit" name="diff" value="Diff" /> |
| 769 | if( P("diff")!=0 ){ |
| 770 | u64 diffFlags = construct_diff_flags(0,0) | |
| 771 | DIFF_STRIP_EOLCR; |
| 772 | Blob from, to, out; |
| 773 | blob_init(&to, zContent, -1); |
| 774 | blob_init(&from, skin_file_content(zBasis, zFile), -1); |
| 775 | blob_zero(&out); |
| 776 | if( diffFlags & DIFF_SIDEBYSIDE ){ |
| 777 | text_diff(&from, &to, &out, 0, diffFlags | DIFF_HTML | DIFF_NOTTOOBIG); |
| 778 |
| --- src/skins.c | |
| +++ src/skins.c | |
| @@ -763,15 +763,17 @@ | |
| 763 | @ <br /> |
| 764 | @ <input type="submit" name="submit" value="Apply Changes" /> |
| 765 | @ <hr /> |
| 766 | @ Baseline: \ |
| 767 | skin_emit_skin_selector("basis", zBasis, zDraft); |
| 768 | @ <input type="submit" name="diff" value="Unified Diff" /> |
| 769 | @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" /> |
| 770 | if( P("diff")!=0 || P("sbsdiff")!=0 ){ |
| 771 | u64 diffFlags = construct_diff_flags(0,0) | |
| 772 | DIFF_STRIP_EOLCR; |
| 773 | Blob from, to, out; |
| 774 | if( P("sbsdiff")!=0 ) diffFlags |= DIFF_SIDEBYSIDE; |
| 775 | blob_init(&to, zContent, -1); |
| 776 | blob_init(&from, skin_file_content(zBasis, zFile), -1); |
| 777 | blob_zero(&out); |
| 778 | if( diffFlags & DIFF_SIDEBYSIDE ){ |
| 779 | text_diff(&from, &to, &out, 0, diffFlags | DIFF_HTML | DIFF_NOTTOOBIG); |
| 780 |