Fossil SCM
Performance optimization. Now faster than trunk.
Commit
2cb7f2f9d1ebd157522a7cd167b0f4b9d53f7cce3e83b4e564d3d32cf09190fe
Parent
6ed7541472c4052…
1 file changed
+5
-2
+5
-2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -618,11 +618,14 @@ | ||
| 618 | 618 | }else{ |
| 619 | 619 | colorize = 0; |
| 620 | 620 | } |
| 621 | 621 | } |
| 622 | 622 | } |
| 623 | - if( c=='\t' && !p->escHtml ){ | |
| 623 | + if( c>'>' ){ | |
| 624 | + blob_append_char(pCol, c); | |
| 625 | + if( (c&0xc0)==0x80 ) k--; | |
| 626 | + }else if( c=='\t' && !p->escHtml ){ | |
| 624 | 627 | blob_append(pCol, " ", 1); |
| 625 | 628 | while( (k&7)!=7 && (p->escHtml || k<w) ){ |
| 626 | 629 | blob_append(pCol, " ", 1); |
| 627 | 630 | k++; |
| 628 | 631 | } |
| @@ -635,11 +638,11 @@ | ||
| 635 | 638 | }else if( c=='>' && p->escHtml ){ |
| 636 | 639 | blob_append(pCol, ">", 4); |
| 637 | 640 | }else if( c=='"' && p->escHtml ){ |
| 638 | 641 | blob_append(pCol, """, 6); |
| 639 | 642 | }else{ |
| 640 | - blob_append(pCol, &zIn[i], 1); | |
| 643 | + blob_append_char(pCol, c); | |
| 641 | 644 | if( (c&0xc0)==0x80 ) k--; |
| 642 | 645 | } |
| 643 | 646 | } |
| 644 | 647 | if( needEndSpan ){ |
| 645 | 648 | blob_append(pCol, "</span>", 7); |
| 646 | 649 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -618,11 +618,14 @@ | |
| 618 | }else{ |
| 619 | colorize = 0; |
| 620 | } |
| 621 | } |
| 622 | } |
| 623 | if( c=='\t' && !p->escHtml ){ |
| 624 | blob_append(pCol, " ", 1); |
| 625 | while( (k&7)!=7 && (p->escHtml || k<w) ){ |
| 626 | blob_append(pCol, " ", 1); |
| 627 | k++; |
| 628 | } |
| @@ -635,11 +638,11 @@ | |
| 635 | }else if( c=='>' && p->escHtml ){ |
| 636 | blob_append(pCol, ">", 4); |
| 637 | }else if( c=='"' && p->escHtml ){ |
| 638 | blob_append(pCol, """, 6); |
| 639 | }else{ |
| 640 | blob_append(pCol, &zIn[i], 1); |
| 641 | if( (c&0xc0)==0x80 ) k--; |
| 642 | } |
| 643 | } |
| 644 | if( needEndSpan ){ |
| 645 | blob_append(pCol, "</span>", 7); |
| 646 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -618,11 +618,14 @@ | |
| 618 | }else{ |
| 619 | colorize = 0; |
| 620 | } |
| 621 | } |
| 622 | } |
| 623 | if( c>'>' ){ |
| 624 | blob_append_char(pCol, c); |
| 625 | if( (c&0xc0)==0x80 ) k--; |
| 626 | }else if( c=='\t' && !p->escHtml ){ |
| 627 | blob_append(pCol, " ", 1); |
| 628 | while( (k&7)!=7 && (p->escHtml || k<w) ){ |
| 629 | blob_append(pCol, " ", 1); |
| 630 | k++; |
| 631 | } |
| @@ -635,11 +638,11 @@ | |
| 638 | }else if( c=='>' && p->escHtml ){ |
| 639 | blob_append(pCol, ">", 4); |
| 640 | }else if( c=='"' && p->escHtml ){ |
| 641 | blob_append(pCol, """, 6); |
| 642 | }else{ |
| 643 | blob_append_char(pCol, c); |
| 644 | if( (c&0xc0)==0x80 ) k--; |
| 645 | } |
| 646 | } |
| 647 | if( needEndSpan ){ |
| 648 | blob_append(pCol, "</span>", 7); |
| 649 |