Fossil SCM
Support parameter 'sbs=1' for side-by-side diff rendering in page wdiff.
Commit
0c19d242638100285c90d310a63a09dc6bcb1ff19315bc1b61cd0711160e17f8
Parent
4dd95f634c6d3c0…
1 file changed
+1
+1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -932,10 +932,11 @@ | ||
| 932 | 932 | if( rid2 && (pW2 = manifest_get(rid2, CFTYPE_WIKI, 0))!=0 ){ |
| 933 | 933 | blob_init(&w2, pW2->zWiki, -1); |
| 934 | 934 | } |
| 935 | 935 | blob_zero(&d); |
| 936 | 936 | diffFlags = construct_diff_flags(1); |
| 937 | + if( P("sbs")!=0 ) diffFlags |= DIFF_SIDEBYSIDE; | |
| 937 | 938 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 938 | 939 | @ <pre class="udiff"> |
| 939 | 940 | @ %s(blob_str(&d)) |
| 940 | 941 | @ <pre> |
| 941 | 942 | manifest_destroy(pW1); |
| 942 | 943 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -932,10 +932,11 @@ | |
| 932 | if( rid2 && (pW2 = manifest_get(rid2, CFTYPE_WIKI, 0))!=0 ){ |
| 933 | blob_init(&w2, pW2->zWiki, -1); |
| 934 | } |
| 935 | blob_zero(&d); |
| 936 | diffFlags = construct_diff_flags(1); |
| 937 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 938 | @ <pre class="udiff"> |
| 939 | @ %s(blob_str(&d)) |
| 940 | @ <pre> |
| 941 | manifest_destroy(pW1); |
| 942 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -932,10 +932,11 @@ | |
| 932 | if( rid2 && (pW2 = manifest_get(rid2, CFTYPE_WIKI, 0))!=0 ){ |
| 933 | blob_init(&w2, pW2->zWiki, -1); |
| 934 | } |
| 935 | blob_zero(&d); |
| 936 | diffFlags = construct_diff_flags(1); |
| 937 | if( P("sbs")!=0 ) diffFlags |= DIFF_SIDEBYSIDE; |
| 938 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 939 | @ <pre class="udiff"> |
| 940 | @ %s(blob_str(&d)) |
| 941 | @ <pre> |
| 942 | manifest_destroy(pW1); |
| 943 |