Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Style en comment fixes, backported from [d57f0a9361] |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c7b2b2ed3ce6b253495d2695ddc32b76 |
| User & Date: | jan.nijtmans 2012-10-30 16:14:58.517 |
Context
|
2012-10-30
| ||
| 18:14 | Update to the version of SQLite that adds support for coroutines used to generate subqueries. ... (check-in: bdbe6c74b8 user: drh tags: trunk) | |
| 16:16 | merge trunk ... (check-in: 27d8f1b6d0 user: jan.nijtmans tags: use-blob_strip_bom) | |
| 16:14 | Style en comment fixes, backported from [d57f0a9361] ... (check-in: c7b2b2ed3c user: jan.nijtmans tags: trunk) | |
| 10:23 | Fix a typo in a comment. ... (check-in: 1167d7b145 user: drh tags: trunk) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
880 881 882 883 884 885 886 | md5sum_blob(pOut, &mcksum); blob_appendf(pOut, "Z %b\n", &mcksum); if( pnFBcard ) *pnFBcard = nFBcard; } /* ** Issue a warning and give the user an opportunity to abandon out | > | | | | | | | | | | | | | 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 |
md5sum_blob(pOut, &mcksum);
blob_appendf(pOut, "Z %b\n", &mcksum);
if( pnFBcard ) *pnFBcard = nFBcard;
}
/*
** Issue a warning and give the user an opportunity to abandon out
** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
** is seen in a text file.
*/
static void commit_warning(const Blob *p, int crnlOk, const char *zFilename){
int eType; /* return value of looks_like_text() */
char *zMsg; /* Warning message */
Blob fname; /* Relative pathname of the file */
static int allOk = 0; /* Set to true to disable this routine */
if( allOk ) return;
eType = looks_like_text(p);
if( eType<0 ){
const char *zWarning ;
Blob ans;
char cReply;
if( eType&1 ){
if( crnlOk ){
return; /* We don't want CrLf warnings for this file. */
}
zWarning = "CR/NL line endings";
}else{
zWarning = "Unicode";
}
file_relative_name(zFilename, &fname, 0);
blob_zero(&ans);
zMsg = mprintf(
"%s contains %s. commit anyhow (a=all/y/N)? ",
blob_str(&fname), zWarning );
prompt_user(zMsg, &ans);
fossil_free(zMsg);
cReply = blob_str(&ans)[0];
if( cReply=='a' || cReply=='A' ){
allOk = 1;
}else if( cReply!='y' && cReply!='Y' ){
fossil_fatal("Abandoning commit due to %s in %s",
zWarning , blob_str(&fname));
}
blob_reset(&ans);
blob_reset(&fname);
}
}
/*
|
| ︙ | ︙ | |||
1230 1231 1232 1233 1234 1235 1236 |
blob_zero(&content);
if( file_wd_islink(zFullname) ){
/* Instead of file content, put link destination path */
blob_read_link(&content, zFullname);
}else{
blob_read_from_file(&content, zFullname);
}
| | | 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 |
blob_zero(&content);
if( file_wd_islink(zFullname) ){
/* Instead of file content, put link destination path */
blob_read_link(&content, zFullname);
}else{
blob_read_from_file(&content, zFullname);
}
commit_warning(&content, crnlOk, zFullname);
if( chnged==1 && contains_merge_marker(&content) ){
Blob fname; /* Relative pathname of the file */
nConflict++;
file_relative_name(zFullname, &fname, 0);
fossil_print("possible unresolved merge conflict in %s\n",
blob_str(&fname));
|
| ︙ | ︙ |
Changes to src/diff.c.
| ︙ | ︙ | |||
168 169 170 171 172 173 174 | /* Return results */ *pnLine = nLine; return a; } /* | > > | > > > > > | > | | > > > > | | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 |
/* Return results */
*pnLine = nLine;
return a;
}
/*
** This function attempts to scan each logical line within the blob to
** determine the type of content it appears to contain. Possible return
** values are:
**
** (1) -- The content appears to consist entirely of text, with lines
** delimited by line-feed characters; however, the encoding may
** not be UTF-8.
**
** (0) -- The content appears to be binary because it contains embedded
** NUL (\000) characters or an extremely long line.
**
** (-1) -- The content appears to consist entirely of text, with lines
** delimited by carriage-return, line-feed pairs; however, the
** encoding may not be UTF-8.
**
** (-2) -- The content appears to consist entirely of text, in the
** UTF-16 (BE or LE) encoding.
*/
int looks_like_text(const Blob *pContent){
const char *z = blob_buffer(pContent);
unsigned int n = blob_size(pContent);
int j, c;
int result = 1; /* Assume text with no CR/NL */
/* Check individual lines.
*/
if( n==0 ) return result; /* Empty file -> text */
c = *z;
if( c==0 ) return 0; /* \000 byte in a file -> binary */
if ( n > 1 ){
if ( (c==(char)0xff) && (z[1]==(char)0xfe) ){
return -2;
} else if ( (c==(char)0xfe) && (z[1]==(char)0xff) ){
return -2;
}
}
j = (c!='\n');
while( --n>0 ){
c = *++z; ++j;
if( c==0 ) return 0; /* \000 byte in a file -> binary */
if( c=='\n' ){
if( z[-1]=='\r' ){
result = -1; /* Contains CR/NL, continue */
}
if( j>LENGTH_MASK ){
return 0; /* Very long line -> binary */
}
j = 0;
}
}
|
| ︙ | ︙ |