Fossil

Check-in [28cfb2fb10]
Login

Check-in [28cfb2fb10]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Escape "<" and ">" characters denoting removed and inserted line in the HTML version of side-by-side diff.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 28cfb2fb100d8433b5ea759ef16bfbf9d4425fc8
User & Date: drh 2012-09-26 00:11:59.603
Context
2012-09-26
09:27
Bug-fix: inline editor on Windows should expect mbcs, not utf-8 ... (check-in: 9c9ad8e572 user: jan.nijtmans tags: trunk)
00:11
Escape "<" and ">" characters denoting removed and inserted line in the HTML version of side-by-side diff. ... (check-in: 28cfb2fb10 user: drh tags: trunk)
2012-09-25
06:40
allow Eclipse to be used as fossil development IDE, merged from "fossil-eclipse" branch, which is now closed. ... (check-in: ae356a7b2e user: jan.nijtmans tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/diff.c.
︙︙
973
974
975
976
977
978
979



980

981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996



997

998
999
1000
1001
1002
1003
1004

        if( alignment[j]==1 ){
          s.n = 0;
          sbsWriteLineno(&s, a);
          s.iStart = 0;
          s.zStart = "<span class=\"diffrm\">";
          s.iEnd = s.width;
          sbsWriteText(&s, &A[a], SBS_PAD);



          sbsWrite(&s, " <\n", 3);

          blob_append(pOut, s.zLine, s.n);
          assert( ma>0 );
          ma--;
          a++;
        }else if( alignment[j]==2 ){
          s.n = 0;
          sbsWriteLineChange(&s, &A[a], a, &B[b], b);
          blob_append(pOut, s.zLine, s.n);
          assert( ma>0 && mb>0 );
          ma--;
          mb--;
          a++;
          b++;
        }else{
          s.n = 0;
          sbsWriteSpace(&s, width + 7);



          sbsWrite(&s, " > ", 3);

          sbsWriteLineno(&s, b);
          s.iStart = 0;
          s.zStart = "<span class=\"diffadd\">";
          s.iEnd = s.width;
          sbsWriteText(&s, &B[b], SBS_NEWLINE);
          blob_append(pOut, s.zLine, s.n);
          assert( mb>0 );








>
>
>
|
>
















>
>
>
|
>








973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012

        if( alignment[j]==1 ){
          s.n = 0;
          sbsWriteLineno(&s, a);
          s.iStart = 0;
          s.zStart = "<span class=\"diffrm\">";
          s.iEnd = s.width;
          sbsWriteText(&s, &A[a], SBS_PAD);
          if( escHtml ){
            sbsWrite(&s, " &lt;\n", 6);
          }else{
            sbsWrite(&s, " <\n", 3);
          }
          blob_append(pOut, s.zLine, s.n);
          assert( ma>0 );
          ma--;
          a++;
        }else if( alignment[j]==2 ){
          s.n = 0;
          sbsWriteLineChange(&s, &A[a], a, &B[b], b);
          blob_append(pOut, s.zLine, s.n);
          assert( ma>0 && mb>0 );
          ma--;
          mb--;
          a++;
          b++;
        }else{
          s.n = 0;
          sbsWriteSpace(&s, width + 7);
          if( escHtml ){
            sbsWrite(&s, " &gt; ", 6);
          }else{
            sbsWrite(&s, " > ", 3);
          }
          sbsWriteLineno(&s, b);
          s.iStart = 0;
          s.zStart = "<span class=\"diffadd\">";
          s.iEnd = s.width;
          sbsWriteText(&s, &B[b], SBS_NEWLINE);
          blob_append(pOut, s.zLine, s.n);
          assert( mb>0 );
︙︙