Fossil SCM
Bug-fix: correct calculation of hash-value for lines with different eol-spacing. Taken from [8f885df209], but without the other enhancements. Eliminate some double semicolons.
Commit
7a0f4af68efd069630cf66a17eba4b5ea4c23e08
Parent
d3b2dabaa5eb64e…
2 files changed
+2
-2
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1560,11 +1560,11 @@ | ||
| 1560 | 1560 | ** should be committed. |
| 1561 | 1561 | */ |
| 1562 | 1562 | if( select_commit_files() ){ |
| 1563 | 1563 | prompt_user("continue (y/N)? ", &ans); |
| 1564 | 1564 | cReply = blob_str(&ans)[0]; |
| 1565 | - if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; | |
| 1565 | + if( cReply!='y' && cReply!='Y' ) fossil_exit(1); | |
| 1566 | 1566 | } |
| 1567 | 1567 | isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2"); |
| 1568 | 1568 | if( g.aCommitFile && isAMerge ){ |
| 1569 | 1569 | fossil_fatal("cannot do a partial commit of a merge"); |
| 1570 | 1570 | } |
| @@ -1660,11 +1660,11 @@ | ||
| 1660 | 1660 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1661 | 1661 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1662 | 1662 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1663 | 1663 | prompt_user("unchanged check-in comment. continue (y/N)? ", &ans); |
| 1664 | 1664 | cReply = blob_str(&ans)[0]; |
| 1665 | - if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; | |
| 1665 | + if( cReply!='y' && cReply!='Y' ) fossil_exit(1); | |
| 1666 | 1666 | } |
| 1667 | 1667 | free(zInit); |
| 1668 | 1668 | } |
| 1669 | 1669 | if( blob_size(&comment)==0 ){ |
| 1670 | 1670 | if( !dryRunFlag ){ |
| 1671 | 1671 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1560,11 +1560,11 @@ | |
| 1560 | ** should be committed. |
| 1561 | */ |
| 1562 | if( select_commit_files() ){ |
| 1563 | prompt_user("continue (y/N)? ", &ans); |
| 1564 | cReply = blob_str(&ans)[0]; |
| 1565 | if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; |
| 1566 | } |
| 1567 | isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2"); |
| 1568 | if( g.aCommitFile && isAMerge ){ |
| 1569 | fossil_fatal("cannot do a partial commit of a merge"); |
| 1570 | } |
| @@ -1660,11 +1660,11 @@ | |
| 1660 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1661 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1662 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1663 | prompt_user("unchanged check-in comment. continue (y/N)? ", &ans); |
| 1664 | cReply = blob_str(&ans)[0]; |
| 1665 | if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; |
| 1666 | } |
| 1667 | free(zInit); |
| 1668 | } |
| 1669 | if( blob_size(&comment)==0 ){ |
| 1670 | if( !dryRunFlag ){ |
| 1671 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1560,11 +1560,11 @@ | |
| 1560 | ** should be committed. |
| 1561 | */ |
| 1562 | if( select_commit_files() ){ |
| 1563 | prompt_user("continue (y/N)? ", &ans); |
| 1564 | cReply = blob_str(&ans)[0]; |
| 1565 | if( cReply!='y' && cReply!='Y' ) fossil_exit(1); |
| 1566 | } |
| 1567 | isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2"); |
| 1568 | if( g.aCommitFile && isAMerge ){ |
| 1569 | fossil_fatal("cannot do a partial commit of a merge"); |
| 1570 | } |
| @@ -1660,11 +1660,11 @@ | |
| 1660 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1661 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1662 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1663 | prompt_user("unchanged check-in comment. continue (y/N)? ", &ans); |
| 1664 | cReply = blob_str(&ans)[0]; |
| 1665 | if( cReply!='y' && cReply!='Y' ) fossil_exit(1); |
| 1666 | } |
| 1667 | free(zInit); |
| 1668 | } |
| 1669 | if( blob_size(&comment)==0 ){ |
| 1670 | if( !dryRunFlag ){ |
| 1671 |
+2
-2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -162,14 +162,14 @@ | ||
| 162 | 162 | for(i=0; i<nLine; i++){ |
| 163 | 163 | a[i].z = z; |
| 164 | 164 | for(j=0; z[j] && z[j]!='\n'; j++){} |
| 165 | 165 | k = j; |
| 166 | 166 | while( ignoreWS && k>0 && fossil_isspace(z[k-1]) ){ k--; } |
| 167 | - for(h=0, x=0; x<=k; x++){ | |
| 167 | + for(h=0, x=0; x<k; x++){ | |
| 168 | 168 | h = h ^ (h<<2) ^ z[x]; |
| 169 | 169 | } |
| 170 | - a[i].h = h = (h<<LENGTH_MASK_SZ) | k;; | |
| 170 | + a[i].h = h = (h<<LENGTH_MASK_SZ) | k; | |
| 171 | 171 | h2 = h % nLine; |
| 172 | 172 | a[i].iNext = a[h2].iHash; |
| 173 | 173 | a[h2].iHash = i+1; |
| 174 | 174 | z += j+1; |
| 175 | 175 | } |
| 176 | 176 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -162,14 +162,14 @@ | |
| 162 | for(i=0; i<nLine; i++){ |
| 163 | a[i].z = z; |
| 164 | for(j=0; z[j] && z[j]!='\n'; j++){} |
| 165 | k = j; |
| 166 | while( ignoreWS && k>0 && fossil_isspace(z[k-1]) ){ k--; } |
| 167 | for(h=0, x=0; x<=k; x++){ |
| 168 | h = h ^ (h<<2) ^ z[x]; |
| 169 | } |
| 170 | a[i].h = h = (h<<LENGTH_MASK_SZ) | k;; |
| 171 | h2 = h % nLine; |
| 172 | a[i].iNext = a[h2].iHash; |
| 173 | a[h2].iHash = i+1; |
| 174 | z += j+1; |
| 175 | } |
| 176 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -162,14 +162,14 @@ | |
| 162 | for(i=0; i<nLine; i++){ |
| 163 | a[i].z = z; |
| 164 | for(j=0; z[j] && z[j]!='\n'; j++){} |
| 165 | k = j; |
| 166 | while( ignoreWS && k>0 && fossil_isspace(z[k-1]) ){ k--; } |
| 167 | for(h=0, x=0; x<k; x++){ |
| 168 | h = h ^ (h<<2) ^ z[x]; |
| 169 | } |
| 170 | a[i].h = h = (h<<LENGTH_MASK_SZ) | k; |
| 171 | h2 = h % nLine; |
| 172 | a[i].iNext = a[h2].iHash; |
| 173 | a[h2].iHash = i+1; |
| 174 | z += j+1; |
| 175 | } |
| 176 |