Fossil

Check-in [be15485a]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Adjust check for bypassing Unicode/CR/NL warning.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bellon-unicode
Files: files | file ages | folders
SHA1:be15485aa6a78209c1060da2ebdd3063399da5f5
User & Date: mistachkin 2012-11-25 22:01:03
Context
2012-11-25
22:31
During commit, instead of using the '--force' option to bypass file type warnings, add a new option '--no-warnings'. Closed-Leaf check-in: e9954e58 user: mistachkin tags: bellon-unicode
22:01
Adjust check for bypassing Unicode/CR/NL warning. check-in: be15485a user: mistachkin tags: bellon-unicode
21:42
Patch provided by Stefan Bellon, >Attached you'll find a patch that adds the "unicode-glob" to the >settings and respects its setting in the check-in. Additionally I >disabled all the check-in warnings (crnl, binary and unicode) in case >--force/-f is set on commit. check-in: 0c2f705c user: jan.nijtmans tags: bellon-unicode
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
  eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p);
  if( eType==0 || eType==-1 || fUnicode ){
    const char *zWarning;
    Blob ans;
    char cReply;

    if( eType==-1 && fUnicode ){
      if ( unicodeOk ){
        return; /* We don't want unicode warnings for this file. */
      }
      zWarning = "Unicode and CR/NL line endings";
    }else if( eType==-1 ){
      if( crnlOk ){
        return; /* We don't want CR/NL warnings for this file. */
      }
      zWarning = "CR/NL line endings";







|
|







906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
  eType = fUnicode ? looks_like_utf16(p) : looks_like_utf8(p);
  if( eType==0 || eType==-1 || fUnicode ){
    const char *zWarning;
    Blob ans;
    char cReply;

    if( eType==-1 && fUnicode ){
      if ( crnlOk && unicodeOk ){
        return; /* We don't want Unicode/CR/NL warnings for this file. */
      }
      zWarning = "Unicode and CR/NL line endings";
    }else if( eType==-1 ){
      if( crnlOk ){
        return; /* We don't want CR/NL warnings for this file. */
      }
      zWarning = "CR/NL line endings";