Fossil SCM
Escape "<" and ">" characters denoting removed and inserted line in the HTML version of side-by-side diff.
Commit
28cfb2fb100d8433b5ea759ef16bfbf9d4425fc8
Parent
ae356a7b2e8f311…
1 file changed
+10
-2
+10
-2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -975,11 +975,15 @@ | ||
| 975 | 975 | sbsWriteLineno(&s, a); |
| 976 | 976 | s.iStart = 0; |
| 977 | 977 | s.zStart = "<span class=\"diffrm\">"; |
| 978 | 978 | s.iEnd = s.width; |
| 979 | 979 | sbsWriteText(&s, &A[a], SBS_PAD); |
| 980 | - sbsWrite(&s, " <\n", 3); | |
| 980 | + if( escHtml ){ | |
| 981 | + sbsWrite(&s, " <\n", 6); | |
| 982 | + }else{ | |
| 983 | + sbsWrite(&s, " <\n", 3); | |
| 984 | + } | |
| 981 | 985 | blob_append(pOut, s.zLine, s.n); |
| 982 | 986 | assert( ma>0 ); |
| 983 | 987 | ma--; |
| 984 | 988 | a++; |
| 985 | 989 | }else if( alignment[j]==2 ){ |
| @@ -992,11 +996,15 @@ | ||
| 992 | 996 | a++; |
| 993 | 997 | b++; |
| 994 | 998 | }else{ |
| 995 | 999 | s.n = 0; |
| 996 | 1000 | sbsWriteSpace(&s, width + 7); |
| 997 | - sbsWrite(&s, " > ", 3); | |
| 1001 | + if( escHtml ){ | |
| 1002 | + sbsWrite(&s, " > ", 6); | |
| 1003 | + }else{ | |
| 1004 | + sbsWrite(&s, " > ", 3); | |
| 1005 | + } | |
| 998 | 1006 | sbsWriteLineno(&s, b); |
| 999 | 1007 | s.iStart = 0; |
| 1000 | 1008 | s.zStart = "<span class=\"diffadd\">"; |
| 1001 | 1009 | s.iEnd = s.width; |
| 1002 | 1010 | sbsWriteText(&s, &B[b], SBS_NEWLINE); |
| 1003 | 1011 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -975,11 +975,15 @@ | |
| 975 | sbsWriteLineno(&s, a); |
| 976 | s.iStart = 0; |
| 977 | s.zStart = "<span class=\"diffrm\">"; |
| 978 | s.iEnd = s.width; |
| 979 | sbsWriteText(&s, &A[a], SBS_PAD); |
| 980 | sbsWrite(&s, " <\n", 3); |
| 981 | blob_append(pOut, s.zLine, s.n); |
| 982 | assert( ma>0 ); |
| 983 | ma--; |
| 984 | a++; |
| 985 | }else if( alignment[j]==2 ){ |
| @@ -992,11 +996,15 @@ | |
| 992 | a++; |
| 993 | b++; |
| 994 | }else{ |
| 995 | s.n = 0; |
| 996 | sbsWriteSpace(&s, width + 7); |
| 997 | sbsWrite(&s, " > ", 3); |
| 998 | sbsWriteLineno(&s, b); |
| 999 | s.iStart = 0; |
| 1000 | s.zStart = "<span class=\"diffadd\">"; |
| 1001 | s.iEnd = s.width; |
| 1002 | sbsWriteText(&s, &B[b], SBS_NEWLINE); |
| 1003 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -975,11 +975,15 @@ | |
| 975 | sbsWriteLineno(&s, a); |
| 976 | s.iStart = 0; |
| 977 | s.zStart = "<span class=\"diffrm\">"; |
| 978 | s.iEnd = s.width; |
| 979 | sbsWriteText(&s, &A[a], SBS_PAD); |
| 980 | if( escHtml ){ |
| 981 | sbsWrite(&s, " <\n", 6); |
| 982 | }else{ |
| 983 | sbsWrite(&s, " <\n", 3); |
| 984 | } |
| 985 | blob_append(pOut, s.zLine, s.n); |
| 986 | assert( ma>0 ); |
| 987 | ma--; |
| 988 | a++; |
| 989 | }else if( alignment[j]==2 ){ |
| @@ -992,11 +996,15 @@ | |
| 996 | a++; |
| 997 | b++; |
| 998 | }else{ |
| 999 | s.n = 0; |
| 1000 | sbsWriteSpace(&s, width + 7); |
| 1001 | if( escHtml ){ |
| 1002 | sbsWrite(&s, " > ", 6); |
| 1003 | }else{ |
| 1004 | sbsWrite(&s, " > ", 3); |
| 1005 | } |
| 1006 | sbsWriteLineno(&s, b); |
| 1007 | s.iStart = 0; |
| 1008 | s.zStart = "<span class=\"diffadd\">"; |
| 1009 | s.iEnd = s.width; |
| 1010 | sbsWriteText(&s, &B[b], SBS_NEWLINE); |
| 1011 |