Fossil SCM

Rename "unicode-glob" to "encoding-glob", and improve feedback regarding the existance of the *-glob settings.

jan.nijtmans 2013-01-24 10:48 UTC trunk
Commit f480173856136f6ad30686edc875de969a6f1a91
Parent a5cd2dd64eb8e62…
3 files changed +18 -12 +1 -1 +7 -6
~ src/checkin.c ~ src/configure.c ~ src/db.c
M src/checkin.c
+18 -12
--- src/checkin.c
+++ src/checkin.c
@@ -895,11 +895,11 @@
895895
 */
896896
 static int commit_warning(
897897
 Blob *p, /* The content of the file being committed. */
898898
 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
899899
 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. */
901901
 const char *zFilename /* The full name of the file being committed. */
902902
 ){
903903
 int eType; /* return value of looks_like_utf8/utf16() */
904904
 int fUnicode; /* return value of starts_with_utf16_bom() */
905905
 char *zMsg; /* Warning message */
@@ -909,44 +909,50 @@
909909
 if( allOk ) return 0;
910910
 fUnicode = starts_with_utf16_bom(p, 0);
911911
 eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p);
912912
 if( eType==0 || eType==-1 || fUnicode ){
913913
 const char *zWarning;
914
+ const char *zDisable;
914915
 const char *zConvert = "c=convert/";
915916
 Blob ans;
916917
 char cReply;
917918
918919
 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. */
921922
 }
922
- zWarning = "Unicode and CR/NL line endings";
923
+ zWarning = "CR/NL line endings and Unicode";
924
+ zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
923925
 }else if( eType==-1 ){
924926
 if( crnlOk ){
925927
 return 0; /* We don't want CR/NL warnings for this file. */
926928
 }
927929
 zWarning = "CR/NL line endings";
930
+ zDisable = "\"crnl-glob\" setting";
928931
 }else if( eType==0 ){
929932
 if( binOk ){
930933
 return 0; /* We don't want binary warnings for this file. */
931934
 }
932935
 zWarning = "binary data";
936
+ zDisable = "\"binary-glob\" setting";
933937
 zConvert = ""; /* We cannot convert binary files. */
934938
 }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. */
937941
 }
938942
 zWarning = "Unicode";
943
+ zDisable = "\"encoding-glob\" setting";
939944
 #ifndef _WIN32
940945
 zConvert = ""; /* On Unix, we cannot easily convert Unicode files. */
941946
 #endif
942947
 }
943948
 file_relative_name(zFilename, &fname, 0);
944949
 blob_zero(&ans);
945950
 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);
948954
 prompt_user(zMsg, &ans);
949955
 fossil_free(zMsg);
950956
 cReply = blob_str(&ans)[0];
951957
 if( cReply=='a' || cReply=='A' ){
952958
 allOk = 1;
@@ -1314,25 +1320,25 @@
13141320
 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
13151321
 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
13161322
 g.zLocalRoot,
13171323
 glob_expr("pathname", db_get("crnl-glob","")),
13181324
 glob_expr("pathname", db_get("binary-glob","")),
1319
- glob_expr("pathname", db_get("unicode-glob",""))
1325
+ glob_expr("pathname", db_get("encoding-glob",""))
13201326
 );
13211327
 while( db_step(&q)==SQLITE_ROW ){
13221328
 int id, rid;
13231329
 const char *zFullname;
13241330
 Blob content;
1325
- int crnlOk, binOk, unicodeOk, chnged;
1331
+ int crnlOk, binOk, encodingOk, chnged;
13261332
13271333
 id = db_column_int(&q, 0);
13281334
 zFullname = db_column_text(&q, 1);
13291335
 rid = db_column_int(&q, 2);
13301336
 crnlOk = db_column_int(&q, 3);
13311337
 chnged = db_column_int(&q, 4);
13321338
 binOk = db_column_int(&q, 5);
1333
- unicodeOk = db_column_int(&q, 6);
1339
+ encodingOk = db_column_int(&q, 6);
13341340
13351341
 blob_zero(&content);
13361342
 if( file_wd_islink(zFullname) ){
13371343
 /* Instead of file content, put link destination path */
13381344
 blob_read_link(&content, zFullname);
@@ -1340,11 +1346,11 @@
13401346
 blob_read_from_file(&content, zFullname);
13411347
 }
13421348
 /* Do not emit any warnings when they are disabled. */
13431349
 if( !noWarningFlag ){
13441350
 abortCommit |= commit_warning(&content, crnlOk, binOk,
1345
- unicodeOk, zFullname);
1351
+ encodingOk, zFullname);
13461352
 }
13471353
 if( chnged==1 && contains_merge_marker(&content) ){
13481354
 Blob fname; /* Relative pathname of the file */
13491355
13501356
 nConflict++;
13511357
--- src/checkin.c
+++ src/checkin.c
@@ -895,11 +895,11 @@
895 */
896 static int commit_warning(
897 Blob *p, /* The content of the file being committed. */
898 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
899 int binOk, /* Non-zero if binary warnings should be disabled. */
900 int unicodeOk, /* Non-zero if unicode warnings should be disabled. */
901 const char *zFilename /* The full name of the file being committed. */
902 ){
903 int eType; /* return value of looks_like_utf8/utf16() */
904 int fUnicode; /* return value of starts_with_utf16_bom() */
905 char *zMsg; /* Warning message */
@@ -909,44 +909,50 @@
909 if( allOk ) return 0;
910 fUnicode = starts_with_utf16_bom(p, 0);
911 eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p);
912 if( eType==0 || eType==-1 || fUnicode ){
913 const char *zWarning;
 
914 const char *zConvert = "c=convert/";
915 Blob ans;
916 char cReply;
917
918 if( eType==-1 && fUnicode ){
919 if ( crnlOk && unicodeOk ){
920 return 0; /* We don't want Unicode/CR/NL warnings for this file. */
921 }
922 zWarning = "Unicode and CR/NL line endings";
 
923 }else if( eType==-1 ){
924 if( crnlOk ){
925 return 0; /* We don't want CR/NL warnings for this file. */
926 }
927 zWarning = "CR/NL line endings";
 
928 }else if( eType==0 ){
929 if( binOk ){
930 return 0; /* We don't want binary warnings for this file. */
931 }
932 zWarning = "binary data";
 
933 zConvert = ""; /* We cannot convert binary files. */
934 }else{
935 if ( unicodeOk ){
936 return 0; /* We don't want unicode warnings for this file. */
937 }
938 zWarning = "Unicode";
 
939 #ifndef _WIN32
940 zConvert = ""; /* On Unix, we cannot easily convert Unicode files. */
941 #endif
942 }
943 file_relative_name(zFilename, &fname, 0);
944 blob_zero(&ans);
945 zMsg = mprintf(
946 "%s contains %s. commit anyhow (a=all/%sy/N)? ",
947 blob_str(&fname), zWarning, zConvert);
 
948 prompt_user(zMsg, &ans);
949 fossil_free(zMsg);
950 cReply = blob_str(&ans)[0];
951 if( cReply=='a' || cReply=='A' ){
952 allOk = 1;
@@ -1314,25 +1320,25 @@
1314 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1315 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1316 g.zLocalRoot,
1317 glob_expr("pathname", db_get("crnl-glob","")),
1318 glob_expr("pathname", db_get("binary-glob","")),
1319 glob_expr("pathname", db_get("unicode-glob",""))
1320 );
1321 while( db_step(&q)==SQLITE_ROW ){
1322 int id, rid;
1323 const char *zFullname;
1324 Blob content;
1325 int crnlOk, binOk, unicodeOk, chnged;
1326
1327 id = db_column_int(&q, 0);
1328 zFullname = db_column_text(&q, 1);
1329 rid = db_column_int(&q, 2);
1330 crnlOk = db_column_int(&q, 3);
1331 chnged = db_column_int(&q, 4);
1332 binOk = db_column_int(&q, 5);
1333 unicodeOk = db_column_int(&q, 6);
1334
1335 blob_zero(&content);
1336 if( file_wd_islink(zFullname) ){
1337 /* Instead of file content, put link destination path */
1338 blob_read_link(&content, zFullname);
@@ -1340,11 +1346,11 @@
1340 blob_read_from_file(&content, zFullname);
1341 }
1342 /* Do not emit any warnings when they are disabled. */
1343 if( !noWarningFlag ){
1344 abortCommit |= commit_warning(&content, crnlOk, binOk,
1345 unicodeOk, zFullname);
1346 }
1347 if( chnged==1 && contains_merge_marker(&content) ){
1348 Blob fname; /* Relative pathname of the file */
1349
1350 nConflict++;
1351
--- src/checkin.c
+++ src/checkin.c
@@ -895,11 +895,11 @@
895 */
896 static int commit_warning(
897 Blob *p, /* The content of the file being committed. */
898 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
899 int binOk, /* Non-zero if binary warnings should be disabled. */
900 int encodingOk, /* Non-zero if encoding warnings should be disabled. */
901 const char *zFilename /* The full name of the file being committed. */
902 ){
903 int eType; /* return value of looks_like_utf8/utf16() */
904 int fUnicode; /* return value of starts_with_utf16_bom() */
905 char *zMsg; /* Warning message */
@@ -909,44 +909,50 @@
909 if( allOk ) return 0;
910 fUnicode = starts_with_utf16_bom(p, 0);
911 eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p);
912 if( eType==0 || eType==-1 || fUnicode ){
913 const char *zWarning;
914 const char *zDisable;
915 const char *zConvert = "c=convert/";
916 Blob ans;
917 char cReply;
918
919 if( eType==-1 && fUnicode ){
920 if ( crnlOk && encodingOk ){
921 return 0; /* We don't want CR/NL and Unicode warnings for this file. */
922 }
923 zWarning = "CR/NL line endings and Unicode";
924 zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
925 }else if( eType==-1 ){
926 if( crnlOk ){
927 return 0; /* We don't want CR/NL warnings for this file. */
928 }
929 zWarning = "CR/NL line endings";
930 zDisable = "\"crnl-glob\" setting";
931 }else if( eType==0 ){
932 if( binOk ){
933 return 0; /* We don't want binary warnings for this file. */
934 }
935 zWarning = "binary data";
936 zDisable = "\"binary-glob\" setting";
937 zConvert = ""; /* We cannot convert binary files. */
938 }else{
939 if ( encodingOk ){
940 return 0; /* We don't want encoding warnings for this file. */
941 }
942 zWarning = "Unicode";
943 zDisable = "\"encoding-glob\" setting";
944 #ifndef _WIN32
945 zConvert = ""; /* On Unix, we cannot easily convert Unicode files. */
946 #endif
947 }
948 file_relative_name(zFilename, &fname, 0);
949 blob_zero(&ans);
950 zMsg = mprintf(
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);
954 prompt_user(zMsg, &ans);
955 fossil_free(zMsg);
956 cReply = blob_str(&ans)[0];
957 if( cReply=='a' || cReply=='A' ){
958 allOk = 1;
@@ -1314,25 +1320,25 @@
1320 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1321 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1322 g.zLocalRoot,
1323 glob_expr("pathname", db_get("crnl-glob","")),
1324 glob_expr("pathname", db_get("binary-glob","")),
1325 glob_expr("pathname", db_get("encoding-glob",""))
1326 );
1327 while( db_step(&q)==SQLITE_ROW ){
1328 int id, rid;
1329 const char *zFullname;
1330 Blob content;
1331 int crnlOk, binOk, encodingOk, chnged;
1332
1333 id = db_column_int(&q, 0);
1334 zFullname = db_column_text(&q, 1);
1335 rid = db_column_int(&q, 2);
1336 crnlOk = db_column_int(&q, 3);
1337 chnged = db_column_int(&q, 4);
1338 binOk = db_column_int(&q, 5);
1339 encodingOk = db_column_int(&q, 6);
1340
1341 blob_zero(&content);
1342 if( file_wd_islink(zFullname) ){
1343 /* Instead of file content, put link destination path */
1344 blob_read_link(&content, zFullname);
@@ -1340,11 +1346,11 @@
1346 blob_read_from_file(&content, zFullname);
1347 }
1348 /* Do not emit any warnings when they are disabled. */
1349 if( !noWarningFlag ){
1350 abortCommit |= commit_warning(&content, crnlOk, binOk,
1351 encodingOk, zFullname);
1352 }
1353 if( chnged==1 && contains_merge_marker(&content) ){
1354 Blob fname; /* Relative pathname of the file */
1355
1356 nConflict++;
1357
M src/configure.c
+1 -1
--- src/configure.c
+++ src/configure.c
@@ -103,11 +103,11 @@
103103
 { "project-description", CONFIGSET_PROJ },
104104
 { "manifest", CONFIGSET_PROJ },
105105
 { "binary-glob", CONFIGSET_PROJ },
106106
 { "ignore-glob", CONFIGSET_PROJ },
107107
 { "crnl-glob", CONFIGSET_PROJ },
108
- { "unicode-glob", CONFIGSET_PROJ },
108
+ { "encoding-glob", CONFIGSET_PROJ },
109109
 { "empty-dirs", CONFIGSET_PROJ },
110110
 { "allow-symlinks", CONFIGSET_PROJ },
111111
112112
 { "ticket-table", CONFIGSET_TKT },
113113
 { "ticket-common", CONFIGSET_TKT },
114114
--- src/configure.c
+++ src/configure.c
@@ -103,11 +103,11 @@
103 { "project-description", CONFIGSET_PROJ },
104 { "manifest", CONFIGSET_PROJ },
105 { "binary-glob", CONFIGSET_PROJ },
106 { "ignore-glob", CONFIGSET_PROJ },
107 { "crnl-glob", CONFIGSET_PROJ },
108 { "unicode-glob", CONFIGSET_PROJ },
109 { "empty-dirs", CONFIGSET_PROJ },
110 { "allow-symlinks", CONFIGSET_PROJ },
111
112 { "ticket-table", CONFIGSET_TKT },
113 { "ticket-common", CONFIGSET_TKT },
114
--- src/configure.c
+++ src/configure.c
@@ -103,11 +103,11 @@
103 { "project-description", CONFIGSET_PROJ },
104 { "manifest", CONFIGSET_PROJ },
105 { "binary-glob", CONFIGSET_PROJ },
106 { "ignore-glob", CONFIGSET_PROJ },
107 { "crnl-glob", CONFIGSET_PROJ },
108 { "encoding-glob", CONFIGSET_PROJ },
109 { "empty-dirs", CONFIGSET_PROJ },
110 { "allow-symlinks", CONFIGSET_PROJ },
111
112 { "ticket-table", CONFIGSET_TKT },
113 { "ticket-common", CONFIGSET_TKT },
114
M src/db.c
+7 -6
--- src/db.c
+++ src/db.c
@@ -2091,11 +2091,11 @@
20912091
 { "th1-setup", 0, 40, 0, "" },
20922092
 #ifdef FOSSIL_ENABLE_TCL
20932093
 { "tcl", 0, 0, 0, "off" },
20942094
 { "tcl-setup", 0, 40, 0, "" },
20952095
 #endif
2096
- { "unicode-glob", 0, 40, 1, "" },
2096
+ { "encoding-glob", 0, 40, 1, "" },
20972097
 { "web-browser", 0, 32, 0, "" },
20982098
 { "white-foreground", 0, 0, 0, "off" },
20992099
 { 0,0,0,0,0 }
21002100
 };
21012101
@@ -2179,10 +2179,16 @@
21792179
 **
21802180
 ** empty-dirs A comma or newline-separated list of pathnames. On
21812181
 ** (versionable) update and checkout commands, if no file or directory
21822182
 ** exists with that name, an empty directory will be
21832183
 ** 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.
21842190
 **
21852191
 ** gdiff-command External command to run when performing a graphical
21862192
 ** diff. If undefined, text diff will be used.
21872193
 **
21882194
 ** gmerge-command A graphical merge conflict resolver command operating
@@ -2278,15 +2284,10 @@
22782284
 **
22792285
 ** th1-setup This is the setup script to be evaluated after creating
22802286
 ** and initializing the TH1 interpreter. By default, this
22812287
 ** is empty and no extra setup is performed.
22822288
 **
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
-**
22882289
 ** web-browser A shell command used to launch your preferred
22892290
 ** web browser when given a URL as an argument.
22902291
 ** Defaults to "start" on windows, "open" on Mac,
22912292
 ** and "firefox" on Unix.
22922293
 **
22932294
--- src/db.c
+++ src/db.c
@@ -2091,11 +2091,11 @@
2091 { "th1-setup", 0, 40, 0, "" },
2092 #ifdef FOSSIL_ENABLE_TCL
2093 { "tcl", 0, 0, 0, "off" },
2094 { "tcl-setup", 0, 40, 0, "" },
2095 #endif
2096 { "unicode-glob", 0, 40, 1, "" },
2097 { "web-browser", 0, 32, 0, "" },
2098 { "white-foreground", 0, 0, 0, "off" },
2099 { 0,0,0,0,0 }
2100 };
2101
@@ -2179,10 +2179,16 @@
2179 **
2180 ** empty-dirs A comma or newline-separated list of pathnames. On
2181 ** (versionable) update and checkout commands, if no file or directory
2182 ** exists with that name, an empty directory will be
2183 ** created.
 
 
 
 
 
 
2184 **
2185 ** gdiff-command External command to run when performing a graphical
2186 ** diff. If undefined, text diff will be used.
2187 **
2188 ** gmerge-command A graphical merge conflict resolver command operating
@@ -2278,15 +2284,10 @@
2278 **
2279 ** th1-setup This is the setup script to be evaluated after creating
2280 ** and initializing the TH1 interpreter. By default, this
2281 ** is empty and no extra setup is performed.
2282 **
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 ** web-browser A shell command used to launch your preferred
2289 ** web browser when given a URL as an argument.
2290 ** Defaults to "start" on windows, "open" on Mac,
2291 ** and "firefox" on Unix.
2292 **
2293
--- src/db.c
+++ src/db.c
@@ -2091,11 +2091,11 @@
2091 { "th1-setup", 0, 40, 0, "" },
2092 #ifdef FOSSIL_ENABLE_TCL
2093 { "tcl", 0, 0, 0, "off" },
2094 { "tcl-setup", 0, 40, 0, "" },
2095 #endif
2096 { "encoding-glob", 0, 40, 1, "" },
2097 { "web-browser", 0, 32, 0, "" },
2098 { "white-foreground", 0, 0, 0, "off" },
2099 { 0,0,0,0,0 }
2100 };
2101
@@ -2179,10 +2179,16 @@
2179 **
2180 ** empty-dirs A comma or newline-separated list of pathnames. On
2181 ** (versionable) update and checkout commands, if no file or directory
2182 ** exists with that name, an empty directory will be
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.
2190 **
2191 ** gdiff-command External command to run when performing a graphical
2192 ** diff. If undefined, text diff will be used.
2193 **
2194 ** gmerge-command A graphical merge conflict resolver command operating
@@ -2278,15 +2284,10 @@
2284 **
2285 ** th1-setup This is the setup script to be evaluated after creating
2286 ** and initializing the TH1 interpreter. By default, this
2287 ** is empty and no extra setup is performed.
2288 **
 
 
 
 
 
2289 ** web-browser A shell command used to launch your preferred
2290 ** web browser when given a URL as an argument.
2291 ** Defaults to "start" on windows, "open" on Mac,
2292 ** and "firefox" on Unix.
2293 **
2294

Keyboard Shortcuts

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