Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch diff-experimental Excluding Merge-Ins
This is equivalent to a diff from 98cf5c33bc to 5d836cbda7
2012-02-06
| ||
15:21 | Merge the diff enhancements from the diff-experimental branch into trunk. check-in: bba7aea8ca user: drh tags: trunk | |
15:02 | Tweak to side-by-side alignment: Be more aggressive about marking lines as changed if they are naturally aligned to begin with. Closed-Leaf check-in: 5d836cbda7 user: drh tags: diff-experimental | |
14:28 | Adjust the alignment similarity cutoff score. check-in: 9713e42356 user: drh tags: diff-experimental | |
01:55 | Trying out a greedy algorithm for aligning the two sides of a change with side-by-side diff. This helps in some cases, but we could probably benefit from a better algorithm. check-in: 881b65141b user: drh tags: diff-experimental | |
2012-02-05
| ||
20:22 | Add the "diff optimizer" which tries to shift inserts and deletes to align with natural boundaries in the text. The resulting diff is no more or less correct than the original; it just seems more natural to human readers. check-in: 98cf5c33bc user: drh tags: trunk | |
17:19 | Rearrange code and edit comments in diff logic, for clarity of presentation. No functional changes. check-in: 032da543f0 user: drh tags: trunk | |
Changes to src/diff.c.
353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 ... 378 379 380 381 382 383 384 385 386 387 388 389 390 391 ... 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 ... 442 443 444 445 446 447 448 449 450 451 452 453 454 455 ... 472 473 474 475 476 477 478 479 480 481 482 483 484 485 ... 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 ... 596 597 598 599 600 601 602 603 604 605 606 607 608 609 ... 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 ... 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 |
** Status of a single output line */ typedef struct SbsLine SbsLine; struct SbsLine { char *zLine; /* The output line under construction */ int n; /* Index of next unused slot in the zLine[] */ int width; /* Maximum width of a column in the output */ unsigned char escHtml; /* True to escape html characters */ }; /* ** Flags for sbsWriteText() */ #define SBS_NEWLINE 0x0001 /* End with \n\000 */ #define SBS_PAD 0x0002 /* Pad output to width spaces */ #define SBS_ENDSPAN 0x0004 /* Write a </span> after text */ /* ** Write up to width characters of pLine into z[]. Translate tabs into ** spaces. Add a newline if SBS_NEWLINE is set. Translate HTML characters ** if SBS_HTML is set. Pad the rendering out width bytes if SBS_PAD is set. */ static void sbsWriteText(SbsLine *p, DLine *pLine, unsigned flags){ ................................................................................ int j; /* Number of output characters generated */ int k; /* Cursor position */ const char *zIn = pLine->z; char *z = &p->zLine[p->n]; int w = p->width; for(i=j=k=0; k<w && i<n; i++, k++){ char c = zIn[i]; if( c=='\t' ){ z[j++] = ' '; while( (k&7)!=7 && k<w ){ z[j++] = ' '; k++; } }else if( c=='\r' || c=='\f' ){ z[j++] = ' '; }else if( c=='<' && p->escHtml ){ memcpy(&z[j], "<", 4); ................................................................................ }else if( c=='>' && p->escHtml ){ memcpy(&z[j], ">", 4); j += 4; }else{ z[j++] = c; } } if( (flags & SBS_ENDSPAN) && p->escHtml ){ memcpy(&z[j], "</span>", 7); j += 7; } if( (flags & SBS_PAD)!=0 ){ while( k<w ){ k++; z[j++] = ' '; } } if( flags & SBS_NEWLINE ){ ................................................................................ sbsWriteHtml(p, "<span class=\"diffln\">"); sqlite3_snprintf(7, &p->zLine[p->n], "%5d ", ln+1); p->n += 6; sbsWriteHtml(p, "</span>"); p->zLine[p->n++] = ' '; } /* ** Given a diff context in which the aEdit[] array has been filled ** in, compute a side-by-side diff into pOut. */ static void sbsDiff( DContext *p, /* The computed diff */ ................................................................................ int skip; /* Number of lines to skip */ SbsLine s; /* Output line buffer */ s.zLine = fossil_malloc( 10*width + 100 ); if( s.zLine==0 ) return; s.width = width; s.escHtml = escHtml; A = p->aFrom; B = p->aTo; R = p->aEdit; mxr = p->nEdit; while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; } for(r=0; r<mxr; r += 3*nr){ /* Figure out how many triples to show in a single block */ ................................................................................ /* Show the initial common area */ a += skip; b += skip; m = R[r] - skip; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } a += m; b += m; /* Show the differences */ for(i=0; i<nr; i++){ ma = R[r+i*3+1]; mb = R[r+i*3+2]; m = ma<mb ? ma : mb; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); sbsWriteHtml(&s, "<span class=\"diffchng\">"); sbsWriteText(&s, &A[a+j], SBS_PAD | SBS_ENDSPAN); sbsWrite(&s, " | ", 3); sbsWriteLineno(&s, b+j); sbsWriteHtml(&s, "<span class=\"diffchng\">"); sbsWriteText(&s, &B[b+j], SBS_NEWLINE | SBS_ENDSPAN); blob_append(pOut, s.zLine, s.n); } a += m; b += m; ma -= m; mb -= m; for(j=0; j<ma; j++){ s.n = 0; sbsWriteLineno(&s, a+j); sbsWriteHtml(&s, "<span class=\"diffrm\">"); sbsWriteText(&s, &A[a+j], SBS_PAD | SBS_ENDSPAN); sbsWrite(&s, " <\n", 3); blob_append(pOut, s.zLine, s.n); } a += ma; for(j=0; j<mb; j++){ s.n = 0; sbsWriteSpace(&s, width + 7); sbsWrite(&s, " > ", 3); sbsWriteLineno(&s, b+j); sbsWriteHtml(&s, "<span class=\"diffadd\">"); sbsWriteText(&s, &B[b+j], SBS_NEWLINE | SBS_ENDSPAN); blob_append(pOut, s.zLine, s.n); } b += mb; if( i<nr-1 ){ m = R[r+i*3+3]; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } b += m; ................................................................................ /* Show the final common area */ assert( nr==i ); m = R[r+nr*3]; if( m>nContext ) m = nContext; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } } ................................................................................ lnTo--; p->aEdit[r]--; p->aEdit[r+3]++; cpy--; } /* Shift insertions toward the end of the file */ while( p->aEdit[r+3]>0 && del==0 && ins>0 ){ DLine *pTop = &p->aTo[lnTo]; /* First line inserted */ DLine *pBtm = &p->aTo[lnTo+ins]; /* First line past end of insert */ if( same_dline(pTop, pBtm)==0 ) break; if( LENGTH(pTop)+LENGTH(pBtm-1)<=LENGTH(pTop+1)+LENGTH(pBtm) ) break; lnFrom++; lnTo++; p->aEdit[r]++; ................................................................................ lnTo--; p->aEdit[r]--; p->aEdit[r+3]++; cpy--; } /* Shift deletions toward the end of the file */ while( p->aEdit[r+3]>0 && del>0 && ins==0 ){ DLine *pTop = &p->aFrom[lnFrom]; /* First line deleted */ DLine *pBtm = &p->aFrom[lnFrom+del]; /* First line past end of delete */ if( same_dline(pTop, pBtm)==0 ) break; if( LENGTH(pTop)+LENGTH(pBtm-1)<=LENGTH(pTop)+LENGTH(pBtm) ) break; lnFrom++; lnTo++; p->aEdit[r]++; |
| > > > | | < > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > | | |
353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 ... 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 ... 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 ... 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 ... 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 ... 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 ... 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 .... 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 .... 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 |
** Status of a single output line */ typedef struct SbsLine SbsLine; struct SbsLine { char *zLine; /* The output line under construction */ int n; /* Index of next unused slot in the zLine[] */ int width; /* Maximum width of a column in the output */ unsigned char escHtml; /* True to escape html characters */ int iStart; /* Write zStart prior to character iStart */ const char *zStart; /* A <span> tag */ int iEnd; /* Write </span> prior to character iEnd */ }; /* ** Flags for sbsWriteText() */ #define SBS_NEWLINE 0x0001 /* End with \n\000 */ #define SBS_PAD 0x0002 /* Pad output to width spaces */ /* ** Write up to width characters of pLine into z[]. Translate tabs into ** spaces. Add a newline if SBS_NEWLINE is set. Translate HTML characters ** if SBS_HTML is set. Pad the rendering out width bytes if SBS_PAD is set. */ static void sbsWriteText(SbsLine *p, DLine *pLine, unsigned flags){ ................................................................................ int j; /* Number of output characters generated */ int k; /* Cursor position */ const char *zIn = pLine->z; char *z = &p->zLine[p->n]; int w = p->width; for(i=j=k=0; k<w && i<n; i++, k++){ char c = zIn[i]; if( p->escHtml ){ if( i==p->iStart ){ int x = strlen(p->zStart); memcpy(z+j, p->zStart, x); j += x; }else if( i==p->iEnd ){ memcpy(z+j, "</span>", 7); j += 7; } } if( c=='\t' ){ z[j++] = ' '; while( (k&7)!=7 && k<w ){ z[j++] = ' '; k++; } }else if( c=='\r' || c=='\f' ){ z[j++] = ' '; }else if( c=='<' && p->escHtml ){ memcpy(&z[j], "<", 4); ................................................................................ }else if( c=='>' && p->escHtml ){ memcpy(&z[j], ">", 4); j += 4; }else{ z[j++] = c; } } if( p->escHtml && i<=p->iEnd ){ memcpy(&z[j], "</span>", 7); j += 7; } if( (flags & SBS_PAD)!=0 ){ while( k<w ){ k++; z[j++] = ' '; } } if( flags & SBS_NEWLINE ){ ................................................................................ sbsWriteHtml(p, "<span class=\"diffln\">"); sqlite3_snprintf(7, &p->zLine[p->n], "%5d ", ln+1); p->n += 6; sbsWriteHtml(p, "</span>"); p->zLine[p->n++] = ' '; } /* ** Write out lines that have been edited. Adjust the highlight to cover ** only those parts of the line that actually changed. */ static void sbsWriteLineChange( SbsLine *p, /* The SBS output line */ DLine *pLeft, /* Left line of the change */ int lnLeft, /* Line number for the left line */ DLine *pRight, /* Right line of the change */ int lnRight /* Line number of the right line */ ){ int nLeft; /* Length of left line in bytes */ int nRight; /* Length of right line in bytes */ int nPrefix; /* Length of common prefix */ int nSuffix; /* Length of common suffix */ int width; /* Total column width */ const char *zLeft; /* Text of the left line */ const char *zRight; /* Text of the right line */ nLeft = pLeft->h & LENGTH_MASK; zLeft = pLeft->z; nRight = pRight->h & LENGTH_MASK; zRight = pRight->z; nPrefix = 0; while( nPrefix<nLeft && nPrefix<nRight && zLeft[nPrefix]==zRight[nPrefix] ){ nPrefix++; } nSuffix = 0; if( nPrefix<nLeft && nPrefix<nRight ){ while( nSuffix<nLeft && nSuffix<nRight && zLeft[nLeft-nSuffix-1]==zRight[nRight-nSuffix-1] ){ nSuffix++; } if( nSuffix==nLeft || nSuffix==nRight ) nPrefix = 0; } if( nPrefix+nSuffix > nLeft ) nSuffix = nLeft - nPrefix; if( nPrefix+nSuffix > nRight ) nSuffix = nRight - nPrefix; if( nPrefix+nSuffix==nLeft ){ /* Text inserted on the right */ sbsWriteLineno(p, lnLeft); p->iStart = p->iEnd = -1; sbsWriteText(p, pLeft, SBS_PAD); sbsWrite(p, " | ", 3); sbsWriteLineno(p, lnRight); p->iStart = nPrefix; p->iEnd = nRight - nSuffix; p->zStart = "<span class=\"diffadd\">"; sbsWriteText(p, pRight, SBS_NEWLINE); }else if( nPrefix+nSuffix==nRight ){ /* Text deleted from the left */ sbsWriteLineno(p, lnLeft); p->iStart = nPrefix; p->iEnd = nLeft - nSuffix; p->zStart = "<span class=\"diffrm\">"; sbsWriteText(p, pLeft, SBS_PAD); sbsWrite(p, " | ", 3); sbsWriteLineno(p, lnRight); p->iStart = p->iEnd = -1; sbsWriteText(p, pRight, SBS_NEWLINE); }else{ /* Text modified between left and right */ sbsWriteLineno(p, lnLeft); p->iStart = nPrefix; p->iEnd = nLeft - nSuffix; p->zStart = "<span class=\"diffchng\">"; sbsWriteText(p, pLeft, SBS_PAD); sbsWrite(p, " | ", 3); sbsWriteLineno(p, lnRight); p->iEnd = nRight - nSuffix; sbsWriteText(p, pRight, SBS_NEWLINE); } } /* ** Return the number between 0 and 100 that is smaller the closer pA and ** pB match. Return 0 for a perfect match. Return 100 if pA and pB are ** completely different. */ static int match_dline(DLine *pA, DLine *pB){ const char *zA; const char *zB; int nA; int nB; int minDist; int i; int nMatch; int score; zA = pA->z; zB = pB->z; nA = pA->h & LENGTH_MASK; nB = pB->h & LENGTH_MASK; while( nA>0 && fossil_isspace(zA[0]) ){ nA--; zA++; } while( nA>0 && fossil_isspace(zA[nA-1]) ){ nA--; } while( nB>0 && fossil_isspace(zB[0]) ){ nB--; zB++; } while( nB>0 && fossil_isspace(zB[nB-1]) ){ nB--; } minDist = nA; if( minDist>nB ) minDist = nB; if( minDist==0 ){ score = 100; }else{ for(i=0; i<nA && i<nB && zA[i]==zB[i]; i++){} nMatch = i; for(i=1; i<=nA && i<=nB && zA[nA-i]==zB[nB-i]; i++){} nMatch += i-1; score = (nMatch >= minDist) ? 0 : ((minDist - nMatch)*100)/minDist; } return score; } /* ** There is a change block in which nLeft lines of text on the left are ** converted into nRight lines of text on the right. This routine computes ** how the lines on the left line up with the lines on the right. ** ** The return value is a buffer of unsigned characters, obtained from ** fossil_malloc(). (The caller needs to free the return value using ** fossil_free().) Entries in the returned array have values as follows: ** ** 1. Delete the next line of pLeft. ** 2. The next line of pLeft changes into the next line of pRight. ** 3. Insert the next line of pRight. ** ** The length of the returned array will be just large enough to cause ** all elements of pLeft and pRight to be consumed. ** ** Algorithm: Wagner's minimum edit-distance algorithm, modified by ** adding a cost to each match based on how well the two rows match ** each other. Insertion and deletion costs are 50. Match costs ** are between 0 and 100 where 0 is a perfect match 100 is a complete ** mismatch. */ static unsigned char *sbsAlignment( DLine *aLeft, int nLeft, /* Text on the left */ DLine *aRight, int nRight /* Text on the right */ ){ int i, j, k; /* Loop counters */ int *a; /* One row of the Wagner matrix */ int *pToFree; /* Space that needs to be freed */ unsigned char *aM; /* Wagner result matrix */ int aBuf[100]; /* Stack space for a[] if nRight not to big */ aM = fossil_malloc( (nLeft+1)*(nRight+1) ); if( nLeft==0 ){ memset(aM, 3, nRight); return aM; } if( nRight==0 ){ memset(aM, 1, nLeft); return aM; } if( nRight < (sizeof(aBuf)/sizeof(aBuf[0]))-1 ){ pToFree = 0; a = aBuf; }else{ a = pToFree = fossil_malloc( sizeof(a[0])*(nRight+1) ); } /* Compute the best alignment */ for(i=0; i<=nRight; i++){ aM[i] = 3; a[i] = i*50; } aM[0] = 0; for(j=1; j<=nLeft; j++){ int p = a[0]; a[0] = p+50; aM[j*(nRight+1)] = 1; for(i=1; i<=nRight; i++){ int m = a[i-1]+50; int d = 3; if( m>a[i]+50 ){ m = a[i]+50; d = 1; } if( m>p ){ int score = match_dline(&aLeft[j-1], &aRight[i-1]); if( (score<66 || (i<j+1 && i>j-1)) && m>p+score ){ m = p+score; d = 2; } } p = a[i]; a[i] = m; aM[j*(nRight+1)+i] = d; } } /* Compute the lowest-cost path back through the matrix */ i = nRight; j = nLeft; k = (nRight+1)*(nLeft+1)-1; while( i+j>0 ){ unsigned char c = aM[k--]; if( c==2 ){ assert( i>0 && j>0 ); i--; j--; }else if( c==3 ){ assert( i>0 ); i--; }else{ assert( j>0 ); j--; } aM[k] = aM[j*(nRight+1)+i]; } k++; i = (nRight+1)*(nLeft+1) - k; memmove(aM, &aM[k], i); /* Return the result */ fossil_free(pToFree); return aM; } /* ** Given a diff context in which the aEdit[] array has been filled ** in, compute a side-by-side diff into pOut. */ static void sbsDiff( DContext *p, /* The computed diff */ ................................................................................ int skip; /* Number of lines to skip */ SbsLine s; /* Output line buffer */ s.zLine = fossil_malloc( 10*width + 100 ); if( s.zLine==0 ) return; s.width = width; s.escHtml = escHtml; s.iStart = -1; s.iEnd = -1; A = p->aFrom; B = p->aTo; R = p->aEdit; mxr = p->nEdit; while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; } for(r=0; r<mxr; r += 3*nr){ /* Figure out how many triples to show in a single block */ ................................................................................ /* Show the initial common area */ a += skip; b += skip; m = R[r] - skip; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); s.iStart = s.iEnd = -1; sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } a += m; b += m; /* Show the differences */ for(i=0; i<nr; i++){ unsigned char *alignment; ma = R[r+i*3+1]; /* Lines on left but not on right */ mb = R[r+i*3+2]; /* Lines on right but not on left */ alignment = sbsAlignment(&A[a], ma, &B[b], mb); for(j=0; ma+mb>0; j++){ 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 ); mb--; b++; } } fossil_free(alignment); if( i<nr-1 ){ m = R[r+i*3+3]; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); s.iStart = s.iEnd = -1; sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } b += m; ................................................................................ /* Show the final common area */ assert( nr==i ); m = R[r+nr*3]; if( m>nContext ) m = nContext; for(j=0; j<m; j++){ s.n = 0; sbsWriteLineno(&s, a+j); s.iStart = s.iEnd = -1; sbsWriteText(&s, &A[a+j], SBS_PAD); sbsWrite(&s, " ", 3); sbsWriteLineno(&s, b+j); sbsWriteText(&s, &B[b+j], SBS_NEWLINE); blob_append(pOut, s.zLine, s.n); } } ................................................................................ lnTo--; p->aEdit[r]--; p->aEdit[r+3]++; cpy--; } /* Shift insertions toward the end of the file */ while( r+3<p->nEdit && p->aEdit[r+3]>0 && del==0 && ins>0 ){ DLine *pTop = &p->aTo[lnTo]; /* First line inserted */ DLine *pBtm = &p->aTo[lnTo+ins]; /* First line past end of insert */ if( same_dline(pTop, pBtm)==0 ) break; if( LENGTH(pTop)+LENGTH(pBtm-1)<=LENGTH(pTop+1)+LENGTH(pBtm) ) break; lnFrom++; lnTo++; p->aEdit[r]++; ................................................................................ lnTo--; p->aEdit[r]--; p->aEdit[r+3]++; cpy--; } /* Shift deletions toward the end of the file */ while( r+3<p->nEdit && p->aEdit[r+3]>0 && del>0 && ins==0 ){ DLine *pTop = &p->aFrom[lnFrom]; /* First line deleted */ DLine *pBtm = &p->aFrom[lnFrom+del]; /* First line past end of delete */ if( same_dline(pTop, pBtm)==0 ) break; if( LENGTH(pTop)+LENGTH(pBtm-1)<=LENGTH(pTop)+LENGTH(pBtm) ) break; lnFrom++; lnTo++; p->aEdit[r]++; |
Changes to src/style.c.
762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 |
{ "div.udiff",
"context diff display",
@ font-family: monospace;
@ white-space: pre;
},
{ "span.diffchng",
"changes in a diff",
@ background-color: #ffffc8;
},
{ "span.diffadd",
"added code in a diff",
@ background-color: #e0ffe0;
},
{ "span.diffrm",
"deleted in a diff",
|
| |
762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 |
{ "div.udiff",
"context diff display",
@ font-family: monospace;
@ white-space: pre;
},
{ "span.diffchng",
"changes in a diff",
@ background-color: #e0e0ff;
},
{ "span.diffadd",
"added code in a diff",
@ background-color: #e0ffe0;
},
{ "span.diffrm",
"deleted in a diff",
|