Fossil SCM

Improved alignment by giving a score of 62 to an inserted or deleted line.

drh 2021-09-11 17:28 trunk
Commit 2bded9fb6ce6ee6c5e221ab6cfa971d2f22daf4b74c1680b2a14da00c0708788
1 file changed +1
+1
--- src/diff.c
+++ src/diff.c
@@ -1758,10 +1758,11 @@
17581758
if( nB>250 ) nB = 250;
17591759
avg = (nA+nB)/2;
17601760
if( avg==0 ) return 0;
17611761
nMin = nA;
17621762
if( nB<nMin ) nMin = nB;
1763
+ if( nMin==0 ) return 62;
17631764
for(nPrefix=0; nPrefix<nMin && zA[nPrefix]==zB[nPrefix]; nPrefix++){}
17641765
best = 0;
17651766
if( nPrefix>5 && nPrefix>nMin/2 ){
17661767
best = nPrefix*3/2;
17671768
if( best>=avg ) best = avg - 2;
17681769
--- src/diff.c
+++ src/diff.c
@@ -1758,10 +1758,11 @@
1758 if( nB>250 ) nB = 250;
1759 avg = (nA+nB)/2;
1760 if( avg==0 ) return 0;
1761 nMin = nA;
1762 if( nB<nMin ) nMin = nB;
 
1763 for(nPrefix=0; nPrefix<nMin && zA[nPrefix]==zB[nPrefix]; nPrefix++){}
1764 best = 0;
1765 if( nPrefix>5 && nPrefix>nMin/2 ){
1766 best = nPrefix*3/2;
1767 if( best>=avg ) best = avg - 2;
1768
--- src/diff.c
+++ src/diff.c
@@ -1758,10 +1758,11 @@
1758 if( nB>250 ) nB = 250;
1759 avg = (nA+nB)/2;
1760 if( avg==0 ) return 0;
1761 nMin = nA;
1762 if( nB<nMin ) nMin = nB;
1763 if( nMin==0 ) return 62;
1764 for(nPrefix=0; nPrefix<nMin && zA[nPrefix]==zB[nPrefix]; nPrefix++){}
1765 best = 0;
1766 if( nPrefix>5 && nPrefix>nMin/2 ){
1767 best = nPrefix*3/2;
1768 if( best>=avg ) best = avg - 2;
1769

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button