Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch encoding-glob Excluding Merge-Ins
This is equivalent to a diff from a5cd2dd64e to f480173856
|
2013-01-29
| ||
| 09:15 | Rename "unicode-glob" setting to "encoding-glob". Mention the existance of the *-glob settings in the "fossil commit" warnings. Alphabetize the settings list. check-in: 7d237c49f3 user: jan.nijtmans tags: trunk | |
|
2013-01-25
| ||
| 07:41 | Объединил с основной веткой check-in: 84878d6684 user: orefkov tags: orefkovs-change | |
|
2013-01-24
| ||
| 14:15 | Define CSON_FOSSIL_MODE in cson_amalgamation.h via auto-generation process, as opposed to setting it as a compiler flag. check-in: e9f3e41bc5 user: stephan tags: trunk | |
| 10:53 | merge trunk check-in: ba3e82f189 user: jan.nijtmans tags: ticket-d17d6e5b17 | |
| 10:48 | Rename "unicode-glob" to "encoding-glob", and improve feedback regarding the existance of the *-glob settings. Closed-Leaf check-in: f480173856 user: jan.nijtmans tags: encoding-glob | |
| 10:18 | Further simplification of continuation byte checkin in filenames check-in: a5cd2dd64e user: jan.nijtmans tags: trunk | |
|
2013-01-23
| ||
| 13:24 | Add the max-download-time server option that limits the amount of real-time that the server will spend preparing an xfer protocol reply. check-in: 769c90a230 user: drh tags: trunk | |
Changes to src/checkin.c.
893 893 ** been converted to UTF-8 (if it was UTF-16) with NL line-endings, 894 894 ** and the original file will have been renamed to "<filename>-original". 895 895 */ 896 896 static int commit_warning( 897 897 Blob *p, /* The content of the file being committed. */ 898 898 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */ 899 899 int binOk, /* Non-zero if binary warnings should be disabled. */ 900 - int unicodeOk, /* Non-zero if unicode warnings should be disabled. */ 900 + int encodingOk, /* Non-zero if encoding warnings should be disabled. */ 901 901 const char *zFilename /* The full name of the file being committed. */ 902 902 ){ 903 903 int eType; /* return value of looks_like_utf8/utf16() */ 904 904 int fUnicode; /* return value of starts_with_utf16_bom() */ 905 905 char *zMsg; /* Warning message */ 906 906 Blob fname; /* Relative pathname of the file */ 907 907 static int allOk = 0; /* Set to true to disable this routine */ 908 908 909 909 if( allOk ) return 0; 910 910 fUnicode = starts_with_utf16_bom(p, 0); 911 911 eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p); 912 912 if( eType==0 || eType==-1 || fUnicode ){ 913 913 const char *zWarning; 914 + const char *zDisable; 914 915 const char *zConvert = "c=convert/"; 915 916 Blob ans; 916 917 char cReply; 917 918 918 919 if( eType==-1 && fUnicode ){ 919 - if ( crnlOk && unicodeOk ){ 920 - return 0; /* We don't want Unicode/CR/NL warnings for this file. */ 920 + if ( crnlOk && encodingOk ){ 921 + return 0; /* We don't want CR/NL and Unicode warnings for this file. */ 921 922 } 922 - zWarning = "Unicode and CR/NL line endings"; 923 + zWarning = "CR/NL line endings and Unicode"; 924 + zDisable = "\"crnl-glob\" and \"encoding-glob\" settings"; 923 925 }else if( eType==-1 ){ 924 926 if( crnlOk ){ 925 927 return 0; /* We don't want CR/NL warnings for this file. */ 926 928 } 927 929 zWarning = "CR/NL line endings"; 930 + zDisable = "\"crnl-glob\" setting"; 928 931 }else if( eType==0 ){ 929 932 if( binOk ){ 930 933 return 0; /* We don't want binary warnings for this file. */ 931 934 } 932 935 zWarning = "binary data"; 936 + zDisable = "\"binary-glob\" setting"; 933 937 zConvert = ""; /* We cannot convert binary files. */ 934 938 }else{ 935 - if ( unicodeOk ){ 936 - return 0; /* We don't want unicode warnings for this file. */ 939 + if ( encodingOk ){ 940 + return 0; /* We don't want encoding warnings for this file. */ 937 941 } 938 942 zWarning = "Unicode"; 943 + zDisable = "\"encoding-glob\" setting"; 939 944 #ifndef _WIN32 940 945 zConvert = ""; /* On Unix, we cannot easily convert Unicode files. */ 941 946 #endif 942 947 } 943 948 file_relative_name(zFilename, &fname, 0); 944 949 blob_zero(&ans); 945 950 zMsg = mprintf( 946 - "%s contains %s. commit anyhow (a=all/%sy/N)? ", 947 - blob_str(&fname), zWarning, zConvert); 951 + "%s contains %s. Use --no-warnings or the %s to disable this warning.\n" 952 + "Commit anyhow (a=all/%sy/N)? ", 953 + blob_str(&fname), zWarning, zDisable, zConvert); 948 954 prompt_user(zMsg, &ans); 949 955 fossil_free(zMsg); 950 956 cReply = blob_str(&ans)[0]; 951 957 if( cReply=='a' || cReply=='A' ){ 952 958 allOk = 1; 953 959 }else if( *zConvert && (cReply=='c' || cReply=='C') ){ 954 960 char *zOrig = file_newname(zFilename, "original", 1); ................................................................................ 1312 1318 */ 1313 1319 db_prepare(&q, 1314 1320 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile " 1315 1321 "WHERE chnged==1 AND NOT deleted AND is_selected(id)", 1316 1322 g.zLocalRoot, 1317 1323 glob_expr("pathname", db_get("crnl-glob","")), 1318 1324 glob_expr("pathname", db_get("binary-glob","")), 1319 - glob_expr("pathname", db_get("unicode-glob","")) 1325 + glob_expr("pathname", db_get("encoding-glob","")) 1320 1326 ); 1321 1327 while( db_step(&q)==SQLITE_ROW ){ 1322 1328 int id, rid; 1323 1329 const char *zFullname; 1324 1330 Blob content; 1325 - int crnlOk, binOk, unicodeOk, chnged; 1331 + int crnlOk, binOk, encodingOk, chnged; 1326 1332 1327 1333 id = db_column_int(&q, 0); 1328 1334 zFullname = db_column_text(&q, 1); 1329 1335 rid = db_column_int(&q, 2); 1330 1336 crnlOk = db_column_int(&q, 3); 1331 1337 chnged = db_column_int(&q, 4); 1332 1338 binOk = db_column_int(&q, 5); 1333 - unicodeOk = db_column_int(&q, 6); 1339 + encodingOk = db_column_int(&q, 6); 1334 1340 1335 1341 blob_zero(&content); 1336 1342 if( file_wd_islink(zFullname) ){ 1337 1343 /* Instead of file content, put link destination path */ 1338 1344 blob_read_link(&content, zFullname); 1339 1345 }else{ 1340 1346 blob_read_from_file(&content, zFullname); 1341 1347 } 1342 1348 /* Do not emit any warnings when they are disabled. */ 1343 1349 if( !noWarningFlag ){ 1344 1350 abortCommit |= commit_warning(&content, crnlOk, binOk, 1345 - unicodeOk, zFullname); 1351 + encodingOk, zFullname); 1346 1352 } 1347 1353 if( chnged==1 && contains_merge_marker(&content) ){ 1348 1354 Blob fname; /* Relative pathname of the file */ 1349 1355 1350 1356 nConflict++; 1351 1357 file_relative_name(zFullname, &fname, 0); 1352 1358 fossil_print("possible unresolved merge conflict in %s\n",
Changes to src/configure.c.
101 101 102 102 { "project-name", CONFIGSET_PROJ }, 103 103 { "project-description", CONFIGSET_PROJ }, 104 104 { "manifest", CONFIGSET_PROJ }, 105 105 { "binary-glob", CONFIGSET_PROJ }, 106 106 { "ignore-glob", CONFIGSET_PROJ }, 107 107 { "crnl-glob", CONFIGSET_PROJ }, 108 - { "unicode-glob", CONFIGSET_PROJ }, 108 + { "encoding-glob", CONFIGSET_PROJ }, 109 109 { "empty-dirs", CONFIGSET_PROJ }, 110 110 { "allow-symlinks", CONFIGSET_PROJ }, 111 111 112 112 { "ticket-table", CONFIGSET_TKT }, 113 113 { "ticket-common", CONFIGSET_TKT }, 114 114 { "ticket-change", CONFIGSET_TKT }, 115 115 { "ticket-newpage", CONFIGSET_TKT },
Changes to src/db.c.
2089 2089 { "ssl-identity", 0, 40, 0, "" }, 2090 2090 { "ssh-command", 0, 40, 0, "" }, 2091 2091 { "th1-setup", 0, 40, 0, "" }, 2092 2092 #ifdef FOSSIL_ENABLE_TCL 2093 2093 { "tcl", 0, 0, 0, "off" }, 2094 2094 { "tcl-setup", 0, 40, 0, "" }, 2095 2095 #endif 2096 - { "unicode-glob", 0, 40, 1, "" }, 2096 + { "encoding-glob", 0, 40, 1, "" }, 2097 2097 { "web-browser", 0, 32, 0, "" }, 2098 2098 { "white-foreground", 0, 0, 0, "off" }, 2099 2099 { 0,0,0,0,0 } 2100 2100 }; 2101 2101 2102 2102 /* 2103 2103 ** COMMAND: settings ................................................................................ 2177 2177 ** 2178 2178 ** editor Text editor command used for check-in comments. 2179 2179 ** 2180 2180 ** empty-dirs A comma or newline-separated list of pathnames. On 2181 2181 ** (versionable) update and checkout commands, if no file or directory 2182 2182 ** exists with that name, an empty directory will be 2183 2183 ** created. 2184 +** 2185 +** encoding-glob The VALUE is a comma or newline-separated list of GLOB 2186 +** (versionable) patterns specifying files that the "commit" command will 2187 +** ignore when issuing warnings about text files that may 2188 +** use another encoding than ASCII or UTF-8. Set to "*" 2189 +** to disable encoding checking. 2184 2190 ** 2185 2191 ** gdiff-command External command to run when performing a graphical 2186 2192 ** diff. If undefined, text diff will be used. 2187 2193 ** 2188 2194 ** gmerge-command A graphical merge conflict resolver command operating 2189 2195 ** on four files. 2190 2196 ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" ................................................................................ 2276 2282 ** and initializing the Tcl interpreter. By default, this 2277 2283 ** is empty and no extra setup is performed. 2278 2284 ** 2279 2285 ** th1-setup This is the setup script to be evaluated after creating 2280 2286 ** and initializing the TH1 interpreter. By default, this 2281 2287 ** is empty and no extra setup is performed. 2282 2288 ** 2283 -** unicode-glob The VALUE is a comma or newline-separated list of GLOB 2284 -** (versionable) patterns specifying files that the "commit" command will 2285 -** ignore when issuing warnings about text files that may 2286 -** contain Unicode. Set to "*" to disable Unicode checking. 2287 -** 2288 2289 ** web-browser A shell command used to launch your preferred 2289 2290 ** web browser when given a URL as an argument. 2290 2291 ** Defaults to "start" on windows, "open" on Mac, 2291 2292 ** and "firefox" on Unix. 2292 2293 ** 2293 2294 ** Options: 2294 2295 ** --global set or unset the given property globally instead of